Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(948)

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_result_view.cc

Issue 13722014: linux_aura: Ask the NativeTheme for various colors which were hardcoded. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/omnibox/omnibox_result_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
index d79a220fb1fb4ca087af2663bebb8e77326f6e43..281d1504f927e8330127c67f44fe3a6486a99055 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -159,11 +159,15 @@ SkColor OmniboxResultView::GetColor(
static bool initialized = false;
static SkColor colors[NUM_STATES][NUM_KINDS];
if (!initialized) {
- colors[SELECTED][BACKGROUND] = theme->GetSystemColor(
- ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused);
colors[NORMAL][BACKGROUND] = theme->GetSystemColor(
sky 2013/04/05 23:05:52 Won't this clobber the values set above (such as 1
Elliot Glaysher 2013/04/05 23:07:52 That's in a different static array. colors != win_
ui::NativeTheme::kColorId_TextfieldDefaultBackground);
+ colors[NORMAL][TEXT] = theme->GetSystemColor(
+ ui::NativeTheme::kColorId_TextfieldDefaultColor);
colors[NORMAL][URL] = SkColorSetARGB(0xff, 0x00, 0x99, 0x33);
+ colors[SELECTED][BACKGROUND] = theme->GetSystemColor(
+ ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused);
+ colors[SELECTED][TEXT] = theme->GetSystemColor(
+ ui::NativeTheme::kColorId_TextfieldSelectionColor);
colors[SELECTED][URL] = SkColorSetARGB(0xff, 0x00, 0x66, 0x22);
colors[HOVERED][URL] = SkColorSetARGB(0xff, 0x00, 0x66, 0x22);
CommonInitColors(theme, colors);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698