diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 00:13:13 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 00:13:13 +0000 |
| commit | b26ddea8ddd6e74a12d0af825b46bd6f96a2c914 (patch) | |
| tree | 759fd6906df72283710e4e25a45d5ee874b41669 /chrome/browser/gtk | |
| parent | 1bd14411bfb4f74a8227ebb6e7975a427045de4b (diff) | |
| download | chromium_src-b26ddea8ddd6e74a12d0af825b46bd6f96a2c914.zip chromium_src-b26ddea8ddd6e74a12d0af825b46bd6f96a2c914.tar.gz chromium_src-b26ddea8ddd6e74a12d0af825b46bd6f96a2c914.tar.bz2 | |
[GTK] show the upgrade icon in the wrench menu.
Regardless of whether the user has the system preference for showing icons in menus, we should show this one as it is "urgent".
BUG=none
TEST=manual (faked an upgrade)
Review URL: http://codereview.chromium.org/3398013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/browser_toolbar_gtk.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_toolbar_gtk.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index 8da933d..f802bc5d 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -335,6 +335,15 @@ GtkIconSet* BrowserToolbarGtk::GetIconSetForId(int idr) { return theme_provider_->GetIconSetForId(idr); } +// Always show images because we desire that the upgrade icon always show when +// an upgrade is available regardless of the system setting. +// TODO(estade): Currently we do not show any other icons in this +// menu, even though arguably if the system preference is set to show icons, +// we should show them for Quit, Save, Print, etc. +bool BrowserToolbarGtk::AlwaysShowImages() { + return true; +} + // menus::AcceleratorProvider bool BrowserToolbarGtk::GetAcceleratorForCommandId( diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h index 6225b10..ec0c4c8 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.h +++ b/chrome/browser/gtk/browser_toolbar_gtk.h @@ -94,6 +94,7 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver, // Overridden from MenuGtk::Delegate: virtual void StoppedShowing(); virtual GtkIconSet* GetIconSetForId(int idr); + virtual bool AlwaysShowImages(); // Overridden from menus::AcceleratorProvider: virtual bool GetAcceleratorForCommandId(int id, |