diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 16:49:26 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 16:49:26 +0000 |
| commit | 28065f66296d0d012aa5b02c147f4f77ef8a771e (patch) | |
| tree | 9fc2567cd9a4edaf09a322e2465b8540787c118c /views/controls/label.h | |
| parent | 120e1f1b2728ae5d1d4fed21bddb3533b921fdba (diff) | |
| download | chromium_src-28065f66296d0d012aa5b02c147f4f77ef8a771e.zip chromium_src-28065f66296d0d012aa5b02c147f4f77ef8a771e.tar.gz chromium_src-28065f66296d0d012aa5b02c147f4f77ef8a771e.tar.bz2 | |
Use the system WINDOWTEXT color for labels, instead of black. Also use the system WINDOW color for InfoBubbles, not white. Several places are made to explicitly use black labels where that's correct or respecting system colors is a non-trivial fix (bugs filed for most).
Also, apparently I didn't get all my cleanup changes in the last patch, oops.
BUG=92,21027
TEST=Set theme to high-contrast black on white, check that most pieces of chrome UI have readable text
Review URL: http://codereview.chromium.org/237005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label.h')
| -rw-r--r-- | views/controls/label.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/views/controls/label.h b/views/controls/label.h index 9a5526a..19d921d 100644 --- a/views/controls/label.h +++ b/views/controls/label.h @@ -224,6 +224,10 @@ class Label : public View { int ComputeMultiLineFlags(); gfx::Size GetTextSize(); void Init(const std::wstring& text, const gfx::Font& font); + + // The colors to use for enabled and disabled labels. + static SkColor kEnabledColor, kDisabledColor; + std::wstring text_; GURL url_; gfx::Font font_; |