diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 16:39:13 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 16:39:13 +0000 |
| commit | 0dd6f9b526cec9d8d353f8bdf6ef7e12785f7c25 (patch) | |
| tree | 2554b5ac0a9af14ff4a9a37148a6beed34098aa8 /chrome | |
| parent | 697ef4c118a291ca473a3defdb66b55b2e0f30c8 (diff) | |
| download | chromium_src-0dd6f9b526cec9d8d353f8bdf6ef7e12785f7c25.zip chromium_src-0dd6f9b526cec9d8d353f8bdf6ef7e12785f7c25.tar.gz chromium_src-0dd6f9b526cec9d8d353f8bdf6ef7e12785f7c25.tar.bz2 | |
Pass proper selection colors to webkit via RendererPreference for ChromeOS.
BUG=chromium-os:7488
TEST=Verify selection colors in webkit is the same color as in omnibox selection per chromium-os:7488.
Review URL: http://codereview.chromium.org/3653006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_preferences_util.cc | 8 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc index 0d41cfe..cc4a75c 100644 --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc @@ -31,6 +31,14 @@ void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) { prefs->inactive_selection_fg_color = provider->get_inactive_selection_fg_color(); #endif // !defined(TOOLKIT_VIEWS) + +#if defined(OS_CHROMEOS) + prefs->active_selection_bg_color = SkColorSetRGB(0xDC, 0xE4, 0xFA); + prefs->active_selection_fg_color = SK_ColorBLACK; + prefs->inactive_selection_bg_color = SkColorSetRGB(0xF7, 0xF7, 0xF7); + prefs->inactive_selection_fg_color = SK_ColorBLACK; +#endif // defined(OS_CHROMEOS) + #endif // defined(TOOLKIT_USES_GTK) } diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 0b17633..cc5e759 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -4439,7 +4439,7 @@ void RenderView::OnDisableScrollbarsForSmallWindows( void RenderView::OnSetRendererPrefs(const RendererPreferences& renderer_prefs) { renderer_preferences_ = renderer_prefs; UpdateFontRenderingFromRendererPrefs(); -#if defined(TOOLKIT_GTK) +#if defined(TOOLKIT_USES_GTK) WebColorName name = WebKit::WebColorWebkitFocusRingColor; WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); |