diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-21 20:56:11 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-21 20:56:11 +0000 |
| commit | 281e32a4405d515657c156d240b777d5a1cbb031 (patch) | |
| tree | 5983bd272280eb22c04e3bb1f42a7df7c40b3690 /views/controls/menu/menu_2.h | |
| parent | 3ea8c32bc730e48119b2c86d1c39e7f6d65e1bb6 (diff) | |
| download | chromium_src-281e32a4405d515657c156d240b777d5a1cbb031.zip chromium_src-281e32a4405d515657c156d240b777d5a1cbb031.tar.gz chromium_src-281e32a4405d515657c156d240b777d5a1cbb031.tar.bz2 | |
Fixes bug where submenus weren't working on views/gtk. Submenus end up
creating nested menus. This means that the menu Run is invoked on
isn't necessarily the selected menu. I need to push up state to the
menu run is invoked on, otherwise nothing happens when a menu is selected.
BUG=32662
TEST=see bug
Review URL: http://codereview.chromium.org/545142
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_2.h')
| -rw-r--r-- | views/controls/menu/menu_2.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/views/controls/menu/menu_2.h b/views/controls/menu/menu_2.h index 2b9ea06..4bfe9b9 100644 --- a/views/controls/menu/menu_2.h +++ b/views/controls/menu/menu_2.h @@ -15,6 +15,8 @@ class Point; namespace views { +class NativeMenuGtk; + // A menu. Populated from a model, and relies on a delegate to execute commands. class Menu2 { public: @@ -51,6 +53,8 @@ class Menu2 { menus::MenuModel* model() const { return model_; } private: + friend class NativeMenuGtk; + menus::MenuModel* model_; // The object that actually implements the menu. |