Update RenderPreferences on GTK change.

chrome/browser/tab_contents/interstitial_page.cc

 // Copyright (c) 2006-2008 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/tab_contents/interstitial_page.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/site_instance.h"
+#include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/bindings_policy.h"
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/common/gtk_util.h"
 #endif
 #include "chrome/common/notification_service.h"
 #include "grit/browser_resources.h"
 #include "net/base/escape.h"
 #include "views/window/window_delegate.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 
 namespace {
@@ skipping 92 matching lines @@
       should_discard_pending_nav_entry_(new_navigation),
       enabled_(true),
       action_taken_(false),
       render_view_host_(NULL),
       original_child_id_(tab->render_view_host()->process()->id()),
       original_rvh_id_(tab->render_view_host()->routing_id()),
       should_revert_tab_title_(false),
       resource_dispatcher_host_notified_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(rvh_view_delegate_(
           new InterstitialPageRVHViewDelegate(this))) {
+  renderer_preferences_util::UpdateFromSystemSettings(
+      &renderer_preferences_, tab_->profile());
+
   InitInterstitialPageMap();
   // It would be inconsistent to create an interstitial with no new navigation
   // (which is the case when the interstitial was triggered by a sub-resource on
   // a page) when we have a pending entry (in the process of loading a new top
   // frame).
   DCHECK(new_navigation || !tab->controller().pending_entry());
-
-#if defined(TOOLKIT_GTK)
-  gtk_util::InitRendererPrefsFromGtkSettings(&renderer_preferences_,
-      GtkThemeProvider::GetFrom(tab->profile())->UseGtkTheme());
-#endif
 }
 
 InterstitialPage::~InterstitialPage() {
   InterstitialPageMap::iterator iter = tab_to_interstitial_page_->find(tab_);
   DCHECK(iter != tab_to_interstitial_page_->end()) <<
       "InterstitialPage missing from map. Please add a comment to the bug "
       "http://crbug.com/9442 with the URL you were visiting";
   if (iter != tab_to_interstitial_page_->end())
     tab_to_interstitial_page_->erase(iter);
   DCHECK(!render_view_host_);
@@ skipping 453 matching lines @@
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }
 
 int InterstitialPage::GetBrowserWindowID() const {
   return tab_->GetBrowserWindowID();
 }