From d2c502f0a412ec8cf6da16025bef8b409919c105 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Mon, 20 Sep 2010 19:38:43 +0000 Subject: GTK: The wrench menu should remain open after clicking +/-. This changes the model so there's a property about whether a button should dismiss the menu, modifies the GtkCustomMenu[Item] implementation to obey it, and modifies the BrowserToolbar to update the menu on zoom change. BUG=48240 TEST=matches windows behaviour Review URL: http://codereview.chromium.org/3391009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59963 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/wrench_menu_model.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'chrome/browser/wrench_menu_model.h') diff --git a/chrome/browser/wrench_menu_model.h b/chrome/browser/wrench_menu_model.h index 6f40fde..8011be1 100644 --- a/chrome/browser/wrench_menu_model.h +++ b/chrome/browser/wrench_menu_model.h @@ -26,7 +26,7 @@ class EncodingMenuModel : public menus::SimpleMenuModel, public menus::SimpleMenuModel::Delegate { public: explicit EncodingMenuModel(Browser* browser); - virtual ~EncodingMenuModel() {} + virtual ~EncodingMenuModel(); // Overridden from menus::SimpleMenuModel::Delegate: virtual bool IsCommandIdChecked(int command_id) const; @@ -47,7 +47,7 @@ class EncodingMenuModel : public menus::SimpleMenuModel, class ZoomMenuModel : public menus::SimpleMenuModel { public: explicit ZoomMenuModel(menus::SimpleMenuModel::Delegate* delegate); - virtual ~ZoomMenuModel() {} + virtual ~ZoomMenuModel(); private: void Build(); @@ -78,6 +78,9 @@ class WrenchMenuModel : public menus::SimpleMenuModel, WrenchMenuModel(menus::AcceleratorProvider* provider, Browser* browser); virtual ~WrenchMenuModel(); + // Overridden for ButtonMenuItemModel::Delegate: + virtual bool DoesCommandIdDismissMenu(int command_id) const; + // Overridden for both ButtonMenuItemModel::Delegate and SimpleMenuModel: virtual bool IsLabelForCommandIdDynamic(int command_id) const; virtual string16 GetLabelForCommandId(int command_id) const; -- cgit v1.1