diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 17:54:44 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 17:54:44 +0000 |
| commit | 33a85f181bf099afe9067d50277ea0e85e35f302 (patch) | |
| tree | 75b111393ef958b010c88ade0edba5fd3f811937 /chrome/browser/chromeos/status/clock_menu_button.h | |
| parent | 55a7e5483376a196d3ba2f20ef56223d72f5a915 (diff) | |
| download | chromium_src-33a85f181bf099afe9067d50277ea0e85e35f302.zip chromium_src-33a85f181bf099afe9067d50277ea0e85e35f302.tar.gz chromium_src-33a85f181bf099afe9067d50277ea0e85e35f302.tar.bz2 | |
Lands http://codereview.chromium.org/2928005/ for Dill:
Loads favicons when openning back/forward menu for any urls that don't
have favicons.
BUG=5679
TEST=Restore a tab with a navigation history, check favicons.
Review URL: http://codereview.chromium.org/6708029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status/clock_menu_button.h')
| -rw-r--r-- | chrome/browser/chromeos/status/clock_menu_button.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/status/clock_menu_button.h b/chrome/browser/chromeos/status/clock_menu_button.h index 3f85a2b..434309d 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.h +++ b/chrome/browser/chromeos/status/clock_menu_button.h @@ -42,7 +42,7 @@ class ClockMenuButton : public StatusAreaButton, ui::Accelerator* accelerator) const { return false; } virtual bool IsItemCheckedAt(int index) const { return false; } virtual int GetGroupIdAt(int index) const { return 0; } - virtual bool GetIconAt(int index, SkBitmap* icon) const { return false; } + virtual bool GetIconAt(int index, SkBitmap* icon) { return false; } virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const { return NULL; } @@ -51,6 +51,7 @@ class ClockMenuButton : public StatusAreaButton, virtual void HighlightChangedTo(int index) {} virtual void ActivatedAt(int index); virtual void MenuWillShow() {} + virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) {} // Overridden from ResumeLibrary::Observer: virtual void PowerChanged(PowerLibrary* obj) {} |