Fix compilation under Linux.
This commit is contained in:
Родитель
297ccbbe58
Коммит
0c9aea3308
|
@ -22,7 +22,7 @@ void MenuGtk::Popup(Window* window) {
|
|||
uint32_t triggering_event_time;
|
||||
gfx::Point point;
|
||||
|
||||
BrowserWindow* native_window = window->window();
|
||||
NativeWindow* native_window = window->window();
|
||||
GdkEventButton* event = native_window->GetWebContents()->
|
||||
GetRenderWidgetHostView()->GetLastMouseDown();
|
||||
if (event) {
|
||||
|
|
|
@ -14,12 +14,13 @@ namespace api {
|
|||
|
||||
class MenuGtk : public Menu,
|
||||
public ::MenuGtk::Delegate {
|
||||
public:
|
||||
MenuGtk();
|
||||
|
||||
protected:
|
||||
virtual void Popup(Window* window) OVERRIDE;
|
||||
|
||||
private:
|
||||
MenuGtk();
|
||||
|
||||
scoped_ptr<::MenuGtk> menu_gtk_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(MenuGtk);
|
||||
|
|
|
@ -14,12 +14,13 @@ class Menu2;
|
|||
namespace api {
|
||||
|
||||
class MenuWin : public Menu {
|
||||
public:
|
||||
MenuWin();
|
||||
|
||||
protected:
|
||||
virtual void Popup(Window* window) OVERRIDE;
|
||||
|
||||
private:
|
||||
MenuWin();
|
||||
|
||||
scoped_ptr<atom::Menu2> menu_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(MenuWin);
|
||||
|
|
|
@ -21,7 +21,7 @@ struct Converter<string16> {
|
|||
v8::Handle<v8::Value> val,
|
||||
string16* out) {
|
||||
v8::String::Value s(val);
|
||||
*out = string16(reinterpret_cast<const char16*>(*s), s.length());
|
||||
out->assign(reinterpret_cast<const char16*>(*s), s.length());
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче