4 files changed, 7 insertions, 5 deletions
diff --git a/views/controls/button/button.cc b/views/controls/button/button.cc
index e9f7e2b..c43439c 100644
--- a/views/controls/button/button.cc
+++ b/views/controls/button/button.cc
@@ -31,7 +31,7 @@ void Button::SetAccessibleKeyboardShortcut(const string16& shortcut) {
 ////////////////////////////////////////////////////////////////////////////////
 // Button, View overrides:
 
-bool Button::GetTooltipText(const gfx::Point& p, string16* tooltip) {
+bool Button::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
   if (tooltip_text_.empty())
     return false;
 
diff --git a/views/controls/button/button.h b/views/controls/button/button.h
index f1f1a10..0884ea1 100644
--- a/views/controls/button/button.h
+++ b/views/controls/button/button.h
@@ -40,7 +40,8 @@ class VIEWS_EXPORT Button : public View {
   void SetAccessibleKeyboardShortcut(const string16& shortcut);
 
   // Overridden from View:
-  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip) OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p,
+                              string16* tooltip) const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 76ed12c..8379b41 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -163,7 +163,7 @@ void ToggleImageButton::SetImage(ButtonState state, const SkBitmap* image) {
 // ToggleImageButton, View overrides:
 
 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
-                                       string16* tooltip) {
+                                       string16* tooltip) const {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(p, tooltip);
 
diff --git a/views/controls/button/image_button.h b/views/controls/button/image_button.h
index 0dc3ab4..2ba26fa 100644
--- a/views/controls/button/image_button.h
+++ b/views/controls/button/image_button.h
@@ -96,10 +96,11 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton {
   void SetToggledTooltipText(const string16& tooltip);
 
   // Overridden from ImageButton:
-  virtual void SetImage(ButtonState aState, const SkBitmap* anImage);
+  virtual void SetImage(ButtonState aState, const SkBitmap* anImage) OVERRIDE;
 
   // Overridden from View:
-  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip);
+  virtual bool GetTooltipText(const gfx::Point& p,
+                              string16* tooltip) const OVERRIDE;
 
  private:
   // The parent class's images_ member is used for the current images,