Update RenderPreferences on GTK change.

chrome/browser/gtk/gtk_theme_provider.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
 #include "app/gfx/color_utils.h"
 #include "app/gfx/gtk_util.h"
@@ skipping 153 matching lines @@
 }
 
 void GtkThemeProvider::InitThemesFor(NotificationObserver* observer) {
   observer->Observe(NotificationType::BROWSER_THEME_CHANGED,
                     Source<ThemeProvider>(this),
                     NotificationService::NoDetails());
 }
 
 void GtkThemeProvider::SetTheme(Extension* extension) {
   profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, false);
+  LoadDefaultValues();
   BrowserThemeProvider::SetTheme(extension);
 }
 
 void GtkThemeProvider::UseDefaultTheme() {
   profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, false);
+  LoadDefaultValues();
   BrowserThemeProvider::UseDefaultTheme();
 }
 
 void GtkThemeProvider::SetNativeTheme() {
   profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, true);
   ClearAllThemeData();
   LoadGtkValues();
   NotifyThemeChanged();
 }
 
@@ skipping 42 matching lines @@
   color.pixel = 0;
   color.red = (text.red + (bg.red * kBgWeight)) / (1 + kBgWeight);
   color.green = (text.green + (bg.green * kBgWeight)) / (1 + kBgWeight);
   color.blue = (text.blue + (bg.blue * kBgWeight)) / (1 + kBgWeight);
 
   return color;
 }
 
 void GtkThemeProvider::GetScrollbarColors(GdkColor* thumb_active_color,
                                           GdkColor* thumb_inactive_color,
-                                          GdkColor* track_color,
-                                          bool use_gtk_theme) {
-  if (!use_gtk_theme) {
-    // If using the default non-GTK colors, pick some reasonable choices of
-    // different greys.
-    thumb_active_color->pixel   = 0;
-    thumb_active_color->red     = 64250;
-    thumb_active_color->green   = 63736;
-    thumb_active_color->blue    = 62965;
-    thumb_inactive_color->pixel = 0;
-    thumb_inactive_color->red   = 61680;
-    thumb_inactive_color->green = 60395;
-    thumb_inactive_color->blue  = 58853;
-    track_color->pixel          = 0;
-    track_color->red            = 58339;
-    track_color->green          = 56797;
-    track_color->blue           = 55512;
-    return;
-  }
-
+                                          GdkColor* track_color) {
   // Create window containing scrollbar elements
   GtkWidget* window    = gtk_window_new(GTK_WINDOW_POPUP);
   GtkWidget* fixed     = gtk_fixed_new();
   GtkWidget* scrollbar = gtk_hscrollbar_new(NULL);
   gtk_container_add(GTK_CONTAINER(window), fixed);
   gtk_container_add(GTK_CONTAINER(fixed),  scrollbar);
   gtk_widget_realize(window);
   gtk_widget_realize(scrollbar);
 
   // Draw scrollbar thumb part and track into offscreen image
@@ skipping 112 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   static GdkPixbuf* default_bookmark_icon_ = rb.GetPixbufNamed(
       IDR_DEFAULT_FAVICON);
   return default_bookmark_icon_;
 }
 
 void GtkThemeProvider::LoadThemePrefs() {
   if (use_gtk_) {
     LoadGtkValues();
   } else {
+    LoadDefaultValues();
     BrowserThemeProvider::LoadThemePrefs();
   }
 }
 
 void GtkThemeProvider::NotifyThemeChanged() {
   BrowserThemeProvider::NotifyThemeChanged();
 
   // Notify all GtkChromeButtons of their new rendering mode:
   for (std::vector<GtkWidget*>::iterator it = chrome_buttons_.begin();
        it != chrome_buttons_.end(); ++it) {
@@ skipping 146 matching lines @@
 
   // The inactive color/tint is special: We *must* use the exact insensitive
   // color for all inactive windows, otherwise we end up neon pink half the
   // time.
   SetThemeColorFromGtk(BrowserThemeProvider::COLOR_FRAME_INACTIVE,
                        &inactive_frame_color);
   SetTintToExactColor(BrowserThemeProvider::TINT_FRAME_INACTIVE,
                       &inactive_frame_color);
   SetTintToExactColor(BrowserThemeProvider::TINT_FRAME_INCOGNITO_INACTIVE,
                       &inactive_frame_color);
+
+  focus_ring_color_ = GdkToSkColor(&button_color);
+  GdkColor thumb_active_color, thumb_inactive_color, track_color;
+  GtkThemeProvider::GetScrollbarColors(&thumb_active_color,
+                                       &thumb_inactive_color,
+                                       &track_color);
+  thumb_active_color_ = GdkToSkColor(&thumb_active_color);
+  thumb_inactive_color_ = GdkToSkColor(&thumb_inactive_color);
+  track_color_ = GdkToSkColor(&track_color);
+}
+
+void GtkThemeProvider::LoadDefaultValues() {
+  focus_ring_color_ = SkColorSetARGB(255, 229, 151, 0);
+  thumb_active_color_ = SkColorSetRGB(250, 248, 245);
+  thumb_inactive_color_ = SkColorSetRGB(240, 235, 229);
+  track_color_ = SkColorSetRGB(227, 221, 216);
 }
 
 void GtkThemeProvider::SetThemeColorFromGtk(int id, GdkColor* color) {
   colors_[id] = GdkToSkColor(color);
 }
 
 void GtkThemeProvider::SetThemeTintFromGtk(int id, GdkColor* color) {
   color_utils::HSL default_tint = GetDefaultTint(id);
   color_utils::HSL hsl;
   color_utils::SkColorToHSL(GdkToSkColor(color), &hsl);
@@ skipping 86 matching lines @@
 }
 
 void GtkThemeProvider::OnDestroyChromeButton(GtkWidget* button,
                                              GtkThemeProvider* provider) {
   std::vector<GtkWidget*>::iterator it =
       find(provider->chrome_buttons_.begin(), provider->chrome_buttons_.end(),
            button);
   if (it != provider->chrome_buttons_.end())
     provider->chrome_buttons_.erase(it);
 }