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

Do not behave like bookmarkbar menu

Browse source
This commit is contained in:
Cheng Zhao 2016-01-05 11:57:58 +08:00
parent 48451032e3
commit 43bfce26a7
4 changed files with 60 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,12 +5,11 @@
#ifndef ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
#define ATOM_BROWSER_UI_VIEWS_MENU_DELEGATE_H_
#include <vector>
#include "base/memory/scoped_ptr.h"
#include "ui/views/controls/menu/menu_delegate.h"
namespace views {
class MenuModelAdapter;
class MenuRunner;
}
namespace ui {
@ -51,20 +50,13 @@ class MenuDelegate : public views::MenuDelegate {
views::MenuButton** button) override;
private:
// Gets the cached menu item view from the model.
views::MenuItemView* BuildMenu(ui::MenuModel* model);
// Returns delegate for current item.
views::MenuDelegate* delegate() const { return delegates_[id_]; }
// Close this menu and run the menu of |button|.
void SwitchToSiblingMenu(views::MenuButton* button);
MenuBar* menu_bar_;
// Current item's id.
int id_;
// Cached menu items, managed by MenuRunner.
std::vector<views::MenuItemView*> items_;
// Cached menu delegates for each menu item, managed by us.
std::vector<views::MenuDelegate*> delegates_;
scoped_ptr<views::MenuDelegate> adapter_;
scoped_ptr<views::MenuRunner> menu_runner_;
DISALLOW_COPY_AND_ASSIGN(MenuDelegate);
};