diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-02 22:45:02 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-02 22:45:02 +0000 |
| commit | 38a85719446bd28dba002eb661b7518aa5b8cd3d (patch) | |
| tree | 138c52a65bc9cf20cbdbe8c38e69d430ae6f6f80 /content | |
| parent | 06bc5d9a46ad798452b317fc47be8acd5ff041c5 (diff) | |
| download | chromium_src-38a85719446bd28dba002eb661b7518aa5b8cd3d.zip chromium_src-38a85719446bd28dba002eb661b7518aa5b8cd3d.tar.gz chromium_src-38a85719446bd28dba002eb661b7518aa5b8cd3d.tar.bz2 | |
chromeos: Update focus ring color in WebKit.
This sets WebKit's focus ring color to #4d90fe;
USE_DEFAULT_RENDER_THEME-defining builds like Chrome OS
appear to have been previously using the default of #e59700
from RenderThemeChromiumSkia.
It also makes RenderViewImpl honor the caret blink interval
for USE_DEFAULT_RENDER_THEME instead of just for GTK.
BUG=153080
TEST=manual: focus rings are blue instead of orange
Review URL: https://chromiumcodereview.appspot.com/11673011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 619ed29..e659a48 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -163,6 +163,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" @@ -230,7 +231,6 @@ // * theming #include "ui/native_theme/native_theme_win.h" #elif defined(USE_X11) -#include "third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h" #include "ui/native_theme/native_theme.h" #elif defined(OS_MACOSX) #include "skia/ext/skia_utils_mac.h" @@ -5310,24 +5310,25 @@ void RenderViewImpl::OnSetRendererPrefs( double old_zoom_level = renderer_preferences_.default_zoom_level; renderer_preferences_ = renderer_prefs; UpdateFontRenderingFromRendererPrefs(); -#if defined(TOOLKIT_GTK) + +#if defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK) WebColorName name = WebKit::WebColorWebkitFocusRingColor; WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); +#if defined(TOOLKIT_GTK) ui::NativeTheme::instance()->SetScrollbarColors( renderer_prefs.thumb_inactive_color, renderer_prefs.thumb_active_color, renderer_prefs.track_color); -#endif +#endif // defined(TOOLKIT_GTK) -#if defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK) if (webview()) { #if defined(TOOLKIT_GTK) webview()->setScrollbarColors( renderer_prefs.thumb_inactive_color, renderer_prefs.thumb_active_color, renderer_prefs.track_color); -#endif +#endif // defined(TOOLKIT_GTK) webview()->setSelectionColors( renderer_prefs.active_selection_bg_color, renderer_prefs.active_selection_fg_color, @@ -5335,7 +5336,7 @@ void RenderViewImpl::OnSetRendererPrefs( renderer_prefs.inactive_selection_fg_color); webview()->themeChanged(); } -#endif +#endif // defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK) // If the zoom level for this page matches the old zoom default, and this // is not a plugin, update the zoom level to match the new default. |