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

Unified Diff: chrome/browser/renderer_preferences_util.cc

Issue 11673011: chromeos: Update focus ring color in WebKit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years, 12 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 | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_preferences_util.cc
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index e4d13b9fee753397da3ce50bfd430bdfb3968f44..398923966231f04c2e83e405c9efbb62eaaed60a 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "content/public/common/renderer_preferences.h"
+#include "third_party/skia/include/core/SkColor.h"
#if defined(OS_LINUX) || defined(OS_ANDROID)
#include "ui/gfx/font_render_params_linux.h"
@@ -97,21 +98,21 @@ void UpdateFromSystemSettings(
theme_service->get_inactive_selection_bg_color();
prefs->inactive_selection_fg_color =
theme_service->get_inactive_selection_fg_color();
+
+ const base::TimeDelta cursor_blink_time = gfx::GetCursorBlinkCycle();
+ prefs->caret_blink_interval =
+ cursor_blink_time.InMilliseconds() ?
+ cursor_blink_time.InMilliseconds() / kGtkCursorBlinkCycleFactor :
+ 0;
#elif defined(USE_DEFAULT_RENDER_THEME)
+ prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE);
+
// 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
-#if defined(TOOLKIT_GTK)
- const base::TimeDelta cursor_blink_time = gfx::GetCursorBlinkCycle();
- prefs->caret_blink_interval =
- cursor_blink_time.InMilliseconds() ?
- cursor_blink_time.InMilliseconds() / kGtkCursorBlinkCycleFactor :
- 0;
-#elif defined(USE_AURA)
// WebKit accepts a single parameter to control the interval over which the
// cursor is shown or hidden, so divide Views's time for the full cycle by two
// and then convert to seconds.
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698