diff options
| author | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-15 03:22:17 +0000 |
|---|---|---|
| committer | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-15 03:22:17 +0000 |
| commit | d02a669af17789501d5f78376a45c8818c69e796 (patch) | |
| tree | 7b788961ea4e47edde78fdd922fd828400822968 /views | |
| parent | d66df9d20006d6208882235516919e11fdb34057 (diff) | |
| download | chromium_src-d02a669af17789501d5f78376a45c8818c69e796.zip chromium_src-d02a669af17789501d5f78376a45c8818c69e796.tar.gz chromium_src-d02a669af17789501d5f78376a45c8818c69e796.tar.bz2 | |
Revert 32012-32017
git cl dcommit somehow committed all my local changes in cygwin
TBR=evan
BUG=none
Review URL: http://codereview.chromium.org/396006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/menu_button.cc | 7 | ||||
| -rw-r--r-- | views/controls/button/menu_button.h | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index eb9d952..7fb81cb 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -35,9 +35,6 @@ 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 @@ -255,8 +252,4 @@ 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 44a93c6..1f5f8e8 100644 --- a/views/controls/button/menu_button.h +++ b/views/controls/button/menu_button.h @@ -5,8 +5,6 @@ #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" @@ -27,9 +25,6 @@ class ViewMenuDelegate; //////////////////////////////////////////////////////////////////////////////// class MenuButton : public TextButton { public: - // The menu button's class name. - static const char kViewClassName[]; - // // Create a Button MenuButton(ButtonListener* listener, @@ -61,9 +56,6 @@ 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_; |