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

Merge branch 'master' into chrome52

Browse source
This commit is contained in:
Cheng Zhao 2016-07-21 05:34:36 -06:00
commit b57665330c
203 changed files with 2352 additions and 1220 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/ui/views/menu_delegate.h
View file

@ -7,16 +7,13 @@
#include <memory>
#include "atom/browser/ui/atom_menu_model.h"
#include "ui/views/controls/menu/menu_delegate.h"
namespace views {
class MenuRunner;
}
namespace ui {
class MenuModel;
}
namespace atom {
class MenuBar;
@ -26,7 +23,7 @@ class MenuDelegate : public views::MenuDelegate {
explicit MenuDelegate(MenuBar* menu_bar);
virtual ~MenuDelegate();
void RunMenu(ui::MenuModel* model, views::MenuButton* button);
void RunMenu(AtomMenuModel* model, views::MenuButton* button);
protected:
// views::MenuDelegate: