Merge 166146 - Initialize renderer color preferences to reasonable defaults.

content/shell/shell_gtk.cc

 // Copyright (c) 2012 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 "content/shell/shell.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
-#include "third_party/skia/include/core/SkColor.h"
 
 namespace content {
 
 namespace {
 
 // Callback for Debug > Show web inspector... menu item.
 gboolean ShowWebInspectorActivated(GtkWidget* widget, Shell* shell) {
   shell->ShowDevTools();
   return FALSE;  // Don't stop this message.
 }
@@ skipping 152 matching lines @@
 
   gtk_container_add(GTK_CONTAINER(window_), vbox_);
   gtk_widget_show_all(GTK_WIDGET(window_));
 
   SizeTo(width, height);
 }
 
 void Shell::PlatformSetContents() {
   WebContentsView* content_view = web_contents_->GetView();
   gtk_container_add(GTK_CONTAINER(vbox_), content_view->GetNativeView());
-
-  // As an additional requirement on Linux, we must set the colors for the
-  // render widgets in webkit.
-  content::RendererPreferences* prefs =
-      web_contents_->GetMutableRendererPrefs();
-  prefs->focus_ring_color = SkColorSetARGB(255, 229, 151, 0);
-  prefs->thumb_active_color = SkColorSetRGB(244, 244, 244);
-  prefs->thumb_inactive_color = SkColorSetRGB(234, 234, 234);
-  prefs->track_color = SkColorSetRGB(211, 211, 211);
-
-  prefs->active_selection_bg_color = SkColorSetRGB(30, 144, 255);
-  prefs->active_selection_fg_color = SK_ColorWHITE;
-  prefs->inactive_selection_bg_color = SkColorSetRGB(200, 200, 200);
-  prefs->inactive_selection_fg_color = SkColorSetRGB(50, 50, 50);
 }
 
 void Shell::SizeTo(int width, int height) {
   content_width_ = width;
   content_height_ = height;
   if (web_contents_.get()) {
     gtk_widget_set_size_request(web_contents_->GetNativeView(), width, height);
   }
 }
 
@@ skipping 65 matching lines @@
   gtk_widget_grab_focus(GTK_WIDGET(url_edit_view_));
   return TRUE;
 }
 
 void Shell::PlatformSetTitle(const string16& title) {
   std::string title_utf8 = UTF16ToUTF8(title);
   gtk_window_set_title(GTK_WINDOW(window_), title_utf8.c_str());
 }
 
 }  // namespace content