diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /chrome/browser/renderer_preferences_util.cc | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'chrome/browser/renderer_preferences_util.cc')
| -rw-r--r-- | chrome/browser/renderer_preferences_util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc index bfa0811..e487b93 100644 --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,8 +7,8 @@ #include "chrome/browser/profiles/profile.h" #if defined(TOOLKIT_USES_GTK) -#include "chrome/browser/gtk/gtk_theme_provider.h" -#include "chrome/browser/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/gtk_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #endif namespace renderer_preferences_util { @@ -31,7 +31,7 @@ void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) { prefs->inactive_selection_fg_color = provider->get_inactive_selection_fg_color(); #else - prefs->focus_ring_color = SkColorSetARGB(255, 229, 151, 0); + prefs->focus_ring_color = SkColorSetRGB(0x50, 0x7A, 0xD5); 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); |