Commit d49185be authored by skuhne@chromium.org's avatar skuhne@chromium.org

Fixing highlight & autocomplete colors according to spec


Changing some highlight / autocomplete colors


BUG=115861
TEST=Visually tested


Review URL: http://codereview.chromium.org/9585015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124761 0039d316-1c4b-4281-b951-d872f2087c98
parent 7c2a7ad7
...@@ -153,6 +153,9 @@ SkColor AutocompleteResultView::GetColor(ResultViewState state, ...@@ -153,6 +153,9 @@ SkColor AutocompleteResultView::GetColor(ResultViewState state,
gfx::NativeTheme::kColorId_TextfieldDefaultBackground); gfx::NativeTheme::kColorId_TextfieldDefaultBackground);
colors[NORMAL][TEXT] = theme->GetSystemColor( colors[NORMAL][TEXT] = theme->GetSystemColor(
gfx::NativeTheme::kColorId_TextfieldDefaultColor); gfx::NativeTheme::kColorId_TextfieldDefaultColor);
colors[NORMAL][URL] = SkColorSetARGB(0xff, 0x00, 0x99, 0x33);
colors[SELECTED][URL] = SkColorSetARGB(0xff, 0x00, 0x66, 0x22);
colors[HOVERED][URL] = SkColorSetARGB(0xff, 0x00, 0x66, 0x22);
#elif defined(TOOLKIT_USES_GTK) #elif defined(TOOLKIT_USES_GTK)
GdkColor bg_color, selected_bg_color, text_color, selected_text_color; GdkColor bg_color, selected_bg_color, text_color, selected_text_color;
gtk_util::GetTextColors( gtk_util::GetTextColors(
...@@ -175,8 +178,10 @@ SkColor AutocompleteResultView::GetColor(ResultViewState state, ...@@ -175,8 +178,10 @@ SkColor AutocompleteResultView::GetColor(ResultViewState state,
for (int i = 0; i < NUM_STATES; ++i) { for (int i = 0; i < NUM_STATES; ++i) {
colors[i][DIMMED_TEXT] = colors[i][DIMMED_TEXT] =
color_utils::AlphaBlend(colors[i][TEXT], colors[i][BACKGROUND], 128); color_utils::AlphaBlend(colors[i][TEXT], colors[i][BACKGROUND], 128);
#if !defined(USE_AURA)
colors[i][URL] = color_utils::GetReadableColor(SkColorSetRGB(0, 128, 0), colors[i][URL] = color_utils::GetReadableColor(SkColorSetRGB(0, 128, 0),
colors[i][BACKGROUND]); colors[i][BACKGROUND]);
#endif
} }
initialized = true; initialized = true;
} }
......
...@@ -38,7 +38,7 @@ const SkColor kTextfieldDefaultColor = SK_ColorBLACK; ...@@ -38,7 +38,7 @@ const SkColor kTextfieldDefaultColor = SK_ColorBLACK;
const SkColor kTextfieldDefaultBackground = SK_ColorWHITE; const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
const SkColor kTextfieldSelectionColor = SK_ColorWHITE; const SkColor kTextfieldSelectionColor = SK_ColorWHITE;
const SkColor kTextfieldSelectionBackgroundFocused = const SkColor kTextfieldSelectionBackgroundFocused =
SkColorSetRGB(0x1D, 0x90, 0xFF); SkColorSetARGB(0x54, 0x4D, 0x90, 0xFE);
const SkColor kTextfieldSelectionBackgroundUnfocused = SK_ColorLTGRAY; const SkColor kTextfieldSelectionBackgroundUnfocused = SK_ColorLTGRAY;
} // namespace } // namespace
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment