diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-15 22:35:23 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-15 22:35:23 +0000 |
| commit | 6faf1083ba454f1a0e4d2fb563a7e4f5c30e453f (patch) | |
| tree | d270282a97740a2d475bdd2599bcb00cb053f05a /chrome/browser/chromeos/status/power_menu_button.h | |
| parent | 5db8cd6e1c2048f80931581157adac7cceb691d8 (diff) | |
| download | chromium_src-6faf1083ba454f1a0e4d2fb563a7e4f5c30e453f.zip chromium_src-6faf1083ba454f1a0e4d2fb563a7e4f5c30e453f.tar.gz chromium_src-6faf1083ba454f1a0e4d2fb563a7e4f5c30e453f.tar.bz2 | |
cros: Out-of-line some virtual methods of PowerMenuButton, make constructor explicit
BUG=none
TEST=none
TBR=dpolukhin
Review URL: http://codereview.chromium.org/7033001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status/power_menu_button.h')
| -rw-r--r-- | chrome/browser/chromeos/status/power_menu_button.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h index fa2d6b1..3876bae 100644 --- a/chrome/browser/chromeos/status/power_menu_button.h +++ b/chrome/browser/chromeos/status/power_menu_button.h @@ -27,26 +27,24 @@ class PowerMenuButton : public StatusAreaButton, public ui::MenuModel, public PowerLibrary::Observer { public: - PowerMenuButton(StatusAreaHost* host); + explicit PowerMenuButton(StatusAreaHost* host); virtual ~PowerMenuButton(); // ui::MenuModel implementation. - virtual bool HasIcons() const { return false; } + virtual bool HasIcons() const; virtual int GetItemCount() const; virtual ui::MenuModel::ItemType GetTypeAt(int index) const; - virtual int GetCommandIdAt(int index) const { return index; } + virtual int GetCommandIdAt(int index) const; virtual string16 GetLabelAt(int index) const; - virtual bool IsItemDynamicAt(int index) const { return true; } + virtual bool IsItemDynamicAt(int index) const; virtual bool GetAcceleratorAt(int index, - 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) { return false; } - virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const { - return NULL; - } - virtual bool IsEnabledAt(int index) const { return false; } - virtual ui::MenuModel* GetSubmenuModelAt(int index) const { return NULL; } + ui::Accelerator* accelerator) const; + virtual bool IsItemCheckedAt(int index) const; + virtual int GetGroupIdAt(int index) const; + virtual bool GetIconAt(int index, SkBitmap* icon); + virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const; + virtual bool IsEnabledAt(int index) const; + virtual ui::MenuModel* GetSubmenuModelAt(int index) const; virtual void HighlightChangedTo(int index) {} virtual void ActivatedAt(int index) {} virtual void MenuWillShow() {} @@ -59,7 +57,7 @@ class PowerMenuButton : public StatusAreaButton, int icon_id() const { return icon_id_; } protected: - virtual int icon_width() { return 26; } + virtual int icon_width(); private: // views::View |