summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/status
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/status')
-rw-r--r--chrome/browser/chromeos/status/clock_menu_button.h3
-rw-r--r--chrome/browser/chromeos/status/feedback_menu_button.h3
-rw-r--r--chrome/browser/chromeos/status/language_menu_button.cc5
-rw-r--r--chrome/browser/chromeos/status/language_menu_button.h1
-rw-r--r--chrome/browser/chromeos/status/network_menu_button.h3
-rw-r--r--chrome/browser/chromeos/status/power_menu_button.h3
6 files changed, 18 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/status/clock_menu_button.h b/chrome/browser/chromeos/status/clock_menu_button.h
index 07287f6..5457bec 100644
--- a/chrome/browser/chromeos/status/clock_menu_button.h
+++ b/chrome/browser/chromeos/status/clock_menu_button.h
@@ -41,6 +41,9 @@ class ClockMenuButton : public views::MenuButton,
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 menus::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const {
+ return NULL;
+ }
virtual bool IsEnabledAt(int index) const;
virtual menus::MenuModel* GetSubmenuModelAt(int index) const { return NULL; }
virtual void HighlightChangedTo(int index) {}
diff --git a/chrome/browser/chromeos/status/feedback_menu_button.h b/chrome/browser/chromeos/status/feedback_menu_button.h
index bf7bb49..1b6b1df 100644
--- a/chrome/browser/chromeos/status/feedback_menu_button.h
+++ b/chrome/browser/chromeos/status/feedback_menu_button.h
@@ -47,6 +47,9 @@ class FeedbackMenuButton : public StatusAreaButton,
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 menus::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const {
+ return NULL;
+ }
virtual bool IsEnabledAt(int index) const { return false; }
virtual menus::MenuModel* GetSubmenuModelAt(int index) const { return NULL; }
virtual void HighlightChangedTo(int index) {}
diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc
index a4b7f49..c13ea7b 100644
--- a/chrome/browser/chromeos/status/language_menu_button.cc
+++ b/chrome/browser/chromeos/status/language_menu_button.cc
@@ -239,6 +239,11 @@ bool LanguageMenuButton::GetIconAt(int index, SkBitmap* icon) const {
return false;
}
+menus::ButtonMenuItemModel* LanguageMenuButton::GetButtonMenuItemAt(
+ int index) const {
+ return NULL;
+}
+
bool LanguageMenuButton::IsEnabledAt(int index) const {
// Just return true so all input method names and input method propertie names
// could be clicked.
diff --git a/chrome/browser/chromeos/status/language_menu_button.h b/chrome/browser/chromeos/status/language_menu_button.h
index a029b9d..b0483ce 100644
--- a/chrome/browser/chromeos/status/language_menu_button.h
+++ b/chrome/browser/chromeos/status/language_menu_button.h
@@ -43,6 +43,7 @@ class LanguageMenuButton : public views::MenuButton,
virtual bool IsItemCheckedAt(int index) const;
virtual int GetGroupIdAt(int index) const;
virtual bool GetIconAt(int index, SkBitmap* icon) const;
+ virtual menus::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const;
virtual bool IsEnabledAt(int index) const;
virtual menus::MenuModel* GetSubmenuModelAt(int index) const;
virtual void HighlightChangedTo(int index);
diff --git a/chrome/browser/chromeos/status/network_menu_button.h b/chrome/browser/chromeos/status/network_menu_button.h
index aab1c05..c38c35e 100644
--- a/chrome/browser/chromeos/status/network_menu_button.h
+++ b/chrome/browser/chromeos/status/network_menu_button.h
@@ -71,6 +71,9 @@ class NetworkMenuButton : public StatusAreaButton,
virtual bool IsItemCheckedAt(int index) const;
virtual int GetGroupIdAt(int index) const { return 0; }
virtual bool GetIconAt(int index, SkBitmap* icon) const;
+ virtual menus::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const {
+ return NULL;
+ }
virtual bool IsEnabledAt(int index) const;
virtual menus::MenuModel* GetSubmenuModelAt(int index) const { return NULL; }
virtual void HighlightChangedTo(int index) {}
diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h
index 15601bc..413b744 100644
--- a/chrome/browser/chromeos/status/power_menu_button.h
+++ b/chrome/browser/chromeos/status/power_menu_button.h
@@ -37,6 +37,9 @@ class PowerMenuButton : public StatusAreaButton,
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 menus::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const {
+ return NULL;
+ }
virtual bool IsEnabledAt(int index) const { return false; }
virtual menus::MenuModel* GetSubmenuModelAt(int index) const { return NULL; }
virtual void HighlightChangedTo(int index) {}