mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[Win] Use the modified Menu2 class.

Browse source
This commit is contained in:
Cheng Zhao 2013-08-17 16:45:21 +08:00
parent ee10c469c8
commit 6193a889ff
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser/api/atom_api_menu_win.cc
View file

@ -4,7 +4,7 @@
#include "browser/api/atom_api_menu_win.h" #include "browser/api/atom_api_menu_win.h"
#include "ui/views/controls/menu/menu_2.h" #include "browser/ui/win/menu_2.h"
#include "ui/gfx/point.h" #include "ui/gfx/point.h"
namespace atom { namespace atom {
@ -19,7 +19,7 @@ MenuWin::~MenuWin() {
} }
void MenuWin::Popup(NativeWindow* native_window) { void MenuWin::Popup(NativeWindow* native_window) {
menu_.reset(new views::Menu2(model_.get())); menu_.reset(new atom::Menu2(model_.get()));
menu_->RunContextMenuAt(gfx::Point(0, 0)); menu_->RunContextMenuAt(gfx::Point(0, 0));
} }

8
browser/api/atom_api_menu_win.h
View file

@ -7,12 +7,10 @@
#include "browser/api/atom_api_menu.h" #include "browser/api/atom_api_menu.h"
namespace views {
class Menu2;
}
namespace atom { namespace atom {
class Menu2;
namespace api { namespace api {
class MenuWin : public Menu { class MenuWin : public Menu {
@ -24,7 +22,7 @@ class MenuWin : public Menu {
virtual void Popup(NativeWindow* window) OVERRIDE; virtual void Popup(NativeWindow* window) OVERRIDE;
private: private:
scoped_ptr<views::Menu2> menu_; scoped_ptr<atom::Menu2> menu_;
DISALLOW_COPY_AND_ASSIGN(MenuWin); DISALLOW_COPY_AND_ASSIGN(MenuWin);
}; };