diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 20:51:02 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 20:51:02 +0000 |
| commit | 40e59f901bc45d009b01b5252dc1e6140ba67642 (patch) | |
| tree | 880793e36522e87653c88b867b6e166d2a8d33c2 /views/controls/button | |
| parent | 34831e0d903dc77863f64096e73f136f4742269b (diff) | |
| download | chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.zip chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.tar.gz chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.tar.bz2 | |
Attempt 2 at landing bookmark menus.
The build breakage was the result of a bad ifdef in MenuController,
specifically around the OnKeyDown method.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/173517
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24526 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, 12 insertions, 3 deletions
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index a31f6c9..b5733c0 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -21,9 +21,12 @@ static const int kIconTextPadding = 5; static const int kPreferredPaddingHorizontal = 6; static const int kPreferredPaddingVertical = 5; -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); +// 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); // 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 e18ef59..3fbc2b4 100644 --- a/views/controls/button/text_button.h +++ b/views/controls/button/text_button.h @@ -7,6 +7,7 @@ #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" @@ -102,6 +103,11 @@ 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); |