diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 23:19:42 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 23:19:42 +0000 |
| commit | 1dfd7ad41fcfccf7525f52755d798278286dec1e (patch) | |
| tree | 741dac07762baf3227da894b7f7786823bfed7c3 /chrome/browser/views/toolbar_view.h | |
| parent | 5a715757b21fea252dc5889103650153f04b0822 (diff) | |
| download | chromium_src-1dfd7ad41fcfccf7525f52755d798278286dec1e.zip chromium_src-1dfd7ad41fcfccf7525f52755d798278286dec1e.tar.gz chromium_src-1dfd7ad41fcfccf7525f52755d798278286dec1e.tar.bz2 | |
Wait calling OnMenuOpened until the domui menu is ready to accept input.
* Call OnMenuOpened when the window is mapped.
This is necessary as DOMUI menu doesn't show the popup window until page is renderred.
* Moved listners to Menu2 as Menu2 manages MenuListeners.
BUG=chromium-os:7642
TEST=TestMenuKeyboardAccess,TestAltMenuKeyboardAccess passes with this fix.
Review URL: http://codereview.chromium.org/3678005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.h')
| -rw-r--r-- | chrome/browser/views/toolbar_view.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h index f79ec25..396a392 100644 --- a/chrome/browser/views/toolbar_view.h +++ b/chrome/browser/views/toolbar_view.h @@ -198,16 +198,19 @@ class ToolbarView : public AccessibleToolbarView, // The contents of the wrench menu. scoped_ptr<menus::SimpleMenuModel> wrench_menu_model_; - // Wrench menu. #if defined(OS_CHROMEOS) + // Wrench menu. scoped_ptr<views::Menu2> wrench_menu_; + + // MenuLister is managed by Menu2 on chromeos. + #else + // Wrench menu. scoped_refptr<WrenchMenu> wrench_menu_; -#endif // 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_; |