diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 20:12:59 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 20:12:59 +0000 |
| commit | 345dd30a55dd5219c39a31df9621e715a8947924 (patch) | |
| tree | 3562329aa4aac7361ff092ffb4976d28c59944a1 /views/controls/button | |
| parent | f278f74b49f068b3bc1de49a0d90b33cb0d5c005 (diff) | |
| download | chromium_src-345dd30a55dd5219c39a31df9621e715a8947924.zip chromium_src-345dd30a55dd5219c39a31df9621e715a8947924.tar.gz chromium_src-345dd30a55dd5219c39a31df9621e715a8947924.tar.bz2 | |
Reverts menu patch.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/173508
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
| -rw-r--r-- | views/controls/button/text_button.cc | 9 | ||||
| -rw-r--r-- | views/controls/button/text_button.h | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index b5733c0..a31f6c9 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -21,12 +21,9 @@ static const int kIconTextPadding = 5; static const int kPreferredPaddingHorizontal = 6; static const int kPreferredPaddingVertical = 5; -// static -const SkColor TextButton::kEnabledColor = SkColorSetRGB(6, 45, 117); -// static -const SkColor TextButton::kHighlightColor = SkColorSetARGB(200, 255, 255, 255); -// static -const SkColor TextButton::kDisabledColor = SkColorSetRGB(161, 161, 146); +static const SkColor kEnabledColor = SkColorSetRGB(6, 45, 117); +static const SkColor kHighlightColor = SkColorSetARGB(200, 255, 255, 255); +static const SkColor kDisabledColor = SkColorSetRGB(161, 161, 146); // How long the hover fade animation should last. static const int kHoverAnimationDurationMs = 170; diff --git a/views/controls/button/text_button.h b/views/controls/button/text_button.h index 3fbc2b4..e18ef59 100644 --- a/views/controls/button/text_button.h +++ b/views/controls/button/text_button.h @@ -7,7 +7,6 @@ #include "app/gfx/font.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/skia/include/core/SkColor.h" #include "views/border.h" #include "views/controls/button/custom_button.h" @@ -103,11 +102,6 @@ class TextButton : public CustomButton { virtual gfx::Size GetMinimumSize(); virtual void SetEnabled(bool enabled); - // Text colors. - static const SkColor kEnabledColor; - static const SkColor kHighlightColor; - static const SkColor kDisabledColor; - protected: virtual bool OnMousePressed(const MouseEvent& e); virtual void Paint(gfx::Canvas* canvas); |