diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 17:42:40 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 17:42:40 +0000 |
| commit | 2b9c46d971042edef955d1ef615f841b1d058841 (patch) | |
| tree | 7879dd9ad29c69548fa7559fc5ba319411826a87 /chrome/browser/views/toolbar_view.h | |
| parent | 02a791689967ea7779376b41dc4515aed1434c60 (diff) | |
| download | chromium_src-2b9c46d971042edef955d1ef615f841b1d058841.zip chromium_src-2b9c46d971042edef955d1ef615f841b1d058841.tar.gz chromium_src-2b9c46d971042edef955d1ef615f841b1d058841.tar.bz2 | |
Add --disable-domui-menu switch
I used label/goto in ToolkitView::RunMenu. It sucks, but probably better because the change is smaller than other approach (for branch). Please let me know if you have better idea.
BUG=chromium-os:6497
TEST=none
Review URL: http://codereview.chromium.org/4046001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.h')
| -rw-r--r-- | chrome/browser/views/toolbar_view.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h index 7f50af9..8715dc5 100644 --- a/chrome/browser/views/toolbar_view.h +++ b/chrome/browser/views/toolbar_view.h @@ -31,9 +31,8 @@ class Profile; namespace views { class Menu2; } // namespace views -#else -class WrenchMenu; #endif +class WrenchMenu; // The Browser Window's toolbar. class ToolbarView : public AccessiblePaneView, @@ -200,18 +199,17 @@ class ToolbarView : public AccessiblePaneView, scoped_ptr<menus::SimpleMenuModel> wrench_menu_model_; #if defined(OS_CHROMEOS) - // Wrench menu. - scoped_ptr<views::Menu2> wrench_menu_; - - // MenuLister is managed by Menu2 on chromeos. + // Wrench menu using domui menu. + // MenuLister is managed by Menu2. + scoped_ptr<views::Menu2> wrench_menu_2_; +#endif -#else // Wrench menu. scoped_refptr<WrenchMenu> wrench_menu_; // Vector of listeners to receive callbacks when the menu opens. std::vector<views::MenuListener*> menu_listeners_; -#endif + // The animation that makes the update reminder pulse. scoped_ptr<SlideAnimation> update_reminder_animation_; |