diff options
author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 02:26:55 +0000 |
---|---|---|
committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 02:26:55 +0000 |
commit | d299d9795683e0fcdc2be23f9655c7929050619c (patch) | |
tree | b0c7282175e7f02b760a297733b327df66d2f5b0 /chrome/browser/renderer_preferences_util.cc | |
parent | 942a149f0bc4c77a87bd62067cc326b66e26284c (diff) | |
download | chromium_src-d299d9795683e0fcdc2be23f9655c7929050619c.zip chromium_src-d299d9795683e0fcdc2be23f9655c7929050619c.tar.gz chromium_src-d299d9795683e0fcdc2be23f9655c7929050619c.tar.bz2 |
Fixing highlight color
BUG=118713
TEST=None
Review URL: http://codereview.chromium.org/9826031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_preferences_util.cc')
-rw-r--r-- | chrome/browser/renderer_preferences_util.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc index 0438259..fd84a85 100644 --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc @@ -21,7 +21,6 @@ void UpdateFromSystemSettings( #if defined(TOOLKIT_USES_GTK) gtk_util::UpdateGtkFontSettings(prefs); -#if !defined(OS_CHROMEOS) ThemeServiceGtk* theme_service = ThemeServiceGtk::GetFrom(profile); prefs->focus_ring_color = theme_service->get_focus_ring_color(); @@ -36,15 +35,13 @@ void UpdateFromSystemSettings( theme_service->get_inactive_selection_bg_color(); prefs->inactive_selection_fg_color = theme_service->get_inactive_selection_fg_color(); -#else - prefs->focus_ring_color = SkColorSetRGB(0x50, 0x7A, 0xD5); - prefs->active_selection_bg_color = SkColorSetRGB(0xDC, 0xE4, 0xFA); +#elif defined(USE_ASH) + // This color is 0x544d90fe modulated with 0xffffff. + prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA); prefs->active_selection_fg_color = SK_ColorBLACK; prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); prefs->inactive_selection_fg_color = SK_ColorBLACK; -#endif // defined(OS_CHROMEOS) - -#endif // defined(TOOLKIT_USES_GTK) +#endif prefs->enable_referrers = profile->GetPrefs()->GetBoolean(prefs::kEnableReferrers); |