rebase

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32012 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 0 deletions

diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 7fb81cb..eb9d952 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -35,6 +35,9 @@ static const SkBitmap* kMenuMarker = NULL;
 static const int kMenuMarkerPaddingLeft = 3;
 static const int kMenuMarkerPaddingRight = -1;
 
+// static
+const char MenuButton::kViewClassName[] = "views/MenuButton";
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - constructors, destructors, initialization
@@ -252,4 +255,8 @@ bool MenuButton::GetAccessibleState(AccessibilityTypes::State* state) {
   return true;
 }
 
+std::string MenuButton::GetClassName() const {
+  return kViewClassName;
+}
+
 }  // namespace views
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index 1f5f8e8..44a93c6 100644
--- a/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -5,6 +5,8 @@
 #ifndef VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 
+#include <string>
+
 #include "app/gfx/font.h"
 #include "base/time.h"
 #include "views/background.h"
@@ -25,6 +27,9 @@ class ViewMenuDelegate;
 ////////////////////////////////////////////////////////////////////////////////
 class MenuButton : public TextButton {
  public:
+  // The menu button's class name.
+  static const char kViewClassName[];
+
   //
   // Create a Button
   MenuButton(ButtonListener* listener,
@@ -56,6 +61,9 @@ class MenuButton : public TextButton {
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual bool GetAccessibleState(AccessibilityTypes::State* state);
 
+  // Returns views/MenuButton.
+  virtual std::string GetClassName() const;
+
  protected:
   // True if the menu is currently visible.
   bool menu_visible_;