Remove per-tab preference machinery.

chrome/browser/ui/prefs/prefs_tab_helper.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 "chrome/browser/ui/prefs/prefs_tab_helper.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/overlay_user_pref_store.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_view_host_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/locale_settings.h"
 #include "grit/platform_locale_settings.h"
 #include "webkit/glue/webpreferences.h"
 
 using content::WebContents;
 
 namespace {
 
-const char* kPerTabPrefsToObserve[] = {
-  prefs::kDefaultCharset,
-  prefs::kWebKitJavascriptEnabled,
-  prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
-  prefs::kWebKitLoadsImagesAutomatically,
-  prefs::kWebKitImagesEnabled,
-  prefs::kWebKitPluginsEnabled,
-  prefs::kWebKitCursiveFontFamily,
-  prefs::kWebKitFantasyFontFamily,
-  prefs::kWebKitFixedFontFamily,
-  prefs::kWebKitSansSerifFontFamily,
-  prefs::kWebKitSerifFontFamily,
-  prefs::kWebKitStandardFontFamily,
-  prefs::kWebKitDefaultFontSize,
-  prefs::kWebKitDefaultFixedFontSize,
-  prefs::kWebKitMinimumFontSize,
-  prefs::kWebKitMinimumLogicalFontSize,
-  prefs::kWebKitXSSAuditorEnabled
-};
-
-const int kPerTabPrefsToObserveLength = arraysize(kPerTabPrefsToObserve);
-
 static void RegisterFontsAndCharsetPrefs(PrefService* prefs) {
   WebPreferences pref_defaults;
 
   prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset,
                                      IDS_DEFAULT_ENCODING,
                                      PrefService::SYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamily,
                                      IDS_STANDARD_FONT_FAMILY,
                                      PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamily,
@@ skipping 18 matching lines @@
                                       IDS_DEFAULT_FIXED_FONT_SIZE,
                                       PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumFontSize,
                                       IDS_MINIMUM_FONT_SIZE,
                                       PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumLogicalFontSize,
                                       IDS_MINIMUM_LOGICAL_FONT_SIZE,
                                       PrefService::UNSYNCABLE_PREF);
 }
 
-static void RegisterPerTabUserPrefs(PrefService* prefs) {
-  WebPreferences pref_defaults;
-
-  prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
-                             pref_defaults.javascript_enabled,
-                             PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(
-      prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
-      true,
-      PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
-                             pref_defaults.loads_images_automatically,
-                             PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kWebKitImagesEnabled,
-                             pref_defaults.images_enabled,
-                             PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,
-                             pref_defaults.plugins_enabled,
-                             PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kWebKitXSSAuditorEnabled,
-                             pref_defaults.xss_auditor_enabled,
-                             PrefService::UNSYNCABLE_PREF);
-  RegisterFontsAndCharsetPrefs(prefs);
-}
-
 // The list of prefs we want to observe.
 const char* kPrefsToObserve[] = {
   prefs::kDefaultZoomLevel,
   prefs::kGlobalDefaultCharset,
   prefs::kEnableReferrers,
   prefs::kWebKitAllowDisplayingInsecureContent,
   prefs::kWebKitAllowRunningInsecureContent,
   prefs::kWebKitGlobalCursiveFontFamily,
   prefs::kWebKitGlobalDefaultFixedFontSize,
   prefs::kWebKitGlobalDefaultFontSize,
@@ skipping 217 matching lines @@
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitSerifFontFamilyMap, this);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitSansSerifFontFamilyMap, this);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitCursiveFontFamilyMap, this);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitFantasyFontFamilyMap, this);
   }
 
-  per_tab_prefs_.reset(
-      GetProfile()->GetPrefs()->CreatePrefServiceWithPerTabPrefStore());
-  RegisterPerTabUserPrefs(per_tab_prefs_.get());
-  per_tab_pref_change_registrar_.Init(per_tab_prefs_.get());
-  for (int i = 0; i < kPerTabPrefsToObserveLength; ++i) {
-      per_tab_pref_change_registrar_.Add(kPerTabPrefsToObserve[i], this);
-  }
-
   renderer_preferences_util::UpdateFromSystemSettings(
       web_contents()->GetMutableRendererPrefs(), GetProfile());
 
   registrar_.Add(this, chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED,
                  content::NotificationService::AllSources());
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
 #endif
 }
 
 PrefsTabHelper::~PrefsTabHelper() {
 }
 
 // static
 void PrefsTabHelper::InitIncognitoUserPrefStore(
     OverlayUserPrefStore* pref_store) {
   // List of keys that cannot be changed in the user prefs file by the incognito
   // profile.  All preferences that store information about the browsing history
   // or behavior of the user should have this property.
   pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement);
 }
 
 // static
-void PrefsTabHelper::InitPerTabUserPrefStore(
-    OverlayUserPrefStore* pref_store) {
-  // List of keys that have per-tab and per-profile (Global) counterpart.
-  // Setting a per-profile preference affects all tabs sharing the profile,
-  // unless a tab has specified its own per-tab property value. Changing a
-  // per-profile preference on a per-tab pref store delegates to the underlying
-  // per-profile pref store.
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitJavascriptEnabled,
-      prefs::kWebKitGlobalJavascriptEnabled);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
-      prefs::kWebKitGlobalJavascriptCanOpenWindowsAutomatically);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitLoadsImagesAutomatically,
-      prefs::kWebKitGlobalLoadsImagesAutomatically);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitImagesEnabled);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitPluginsEnabled,
-      prefs::kWebKitGlobalPluginsEnabled);
-  pref_store->RegisterOverlayPref(
-      prefs::kDefaultCharset,
-      prefs::kGlobalDefaultCharset);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitStandardFontFamily,
-      prefs::kWebKitGlobalStandardFontFamily);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitFixedFontFamily,
-      prefs::kWebKitGlobalFixedFontFamily);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitSerifFontFamily,
-      prefs::kWebKitGlobalSerifFontFamily);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitSansSerifFontFamily,
-      prefs::kWebKitGlobalSansSerifFontFamily);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitCursiveFontFamily,
-      prefs::kWebKitGlobalCursiveFontFamily);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitFantasyFontFamily,
-      prefs::kWebKitGlobalFantasyFontFamily);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitDefaultFontSize,
-      prefs::kWebKitGlobalDefaultFontSize);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitDefaultFixedFontSize,
-      prefs::kWebKitGlobalDefaultFixedFontSize);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitMinimumFontSize,
-      prefs::kWebKitGlobalMinimumFontSize);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitMinimumLogicalFontSize,
-      prefs::kWebKitGlobalMinimumLogicalFontSize);
-  pref_store->RegisterOverlayPref(
-      prefs::kWebKitXSSAuditorEnabled);
-}
-
-// static
 void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) {
   WebPreferences pref_defaults;
   prefs->RegisterBooleanPref(prefs::kWebKitGlobalJavascriptEnabled,
                              pref_defaults.javascript_enabled,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,
                              pref_defaults.web_security_enabled,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(
       prefs::kWebKitGlobalJavascriptCanOpenWindowsAutomatically,
@@ skipping 106 matching lines @@
                                       PrefService::SYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kStaticEncodings,
                                      IDS_STATIC_ENCODING_LIST,
                                      PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding,
                             "",
                             PrefService::UNSYNCABLE_PREF);
   MigratePreferences(prefs);
 }
 
-void PrefsTabHelper::RenderViewCreated(
-    content::RenderViewHost* render_view_host) {
-  UpdateWebPreferences();

[falken, 2012/03/23 10:41:12]

It's OK to remove this, right? It was introduced here
http://codereview.chromium.org/8747015/

[mnaganov (inactive), 2012/03/23 10:47:04]

I think so. This was needed because we had overrides for Chrome's WebPreferences
defaults, and it was crucial to apply them at the moment when RenderView has
been created. 

-}
-
-void PrefsTabHelper::WebContentsDestroyed(WebContents* tab) {
-  per_tab_pref_change_registrar_.RemoveAll();
-}
-
 void PrefsTabHelper::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED:
       UpdateWebPreferences();
       break;
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       UpdateRendererPreferences();
       break;
     }
 #endif
     case chrome::NOTIFICATION_PREF_CHANGED: {
       std::string* pref_name_in = content::Details<std::string>(details).ptr();
       DCHECK(content::Source<PrefService>(source).ptr() ==
-                 GetProfile()->GetPrefs() ||
-             content::Source<PrefService>(source).ptr() == per_tab_prefs_);
+                 GetProfile()->GetPrefs());
       if ((*pref_name_in == prefs::kDefaultCharset ||
            *pref_name_in == prefs::kGlobalDefaultCharset) ||
           StartsWithASCII(*pref_name_in, "webkit.webprefs.", true)) {
         UpdateWebPreferences();
       } else if (*pref_name_in == prefs::kDefaultZoomLevel ||
                  *pref_name_in == prefs::kEnableReferrers) {
         UpdateRendererPreferences();
       } else {
         NOTREACHED() << "unexpected pref change notification" << *pref_name_in;
       }
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void PrefsTabHelper::UpdateWebPreferences() {
   content::RenderViewHostDelegate* rvhd =
       web_contents()->GetRenderViewHost()->GetDelegate();
-  WebPreferences prefs = rvhd->GetWebkitPrefs();

[Bernhard Bauer, 2012/03/23 10:48:14]

Where do we fill in the WebPreferences struct now?

[mnaganov (inactive), 2012/03/23 10:58:23]

RenderViewHostDelegate does this. Here we were only overriding per-tab
preferences.

[falken, 2012/03/23 11:01:41]

For reference, this just reverts to the code before the per-tab change:
http://codereview.chromium.org/8716004/diff/14001/chrome/browser/ui/tab_conte...

-  prefs.javascript_enabled =
-      per_tab_prefs_->GetBoolean(prefs::kWebKitJavascriptEnabled);
-  prefs.javascript_can_open_windows_automatically =
-      per_tab_prefs_->GetBoolean(
-          prefs::kWebKitJavascriptCanOpenWindowsAutomatically);
-  prefs.loads_images_automatically =
-      per_tab_prefs_->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
-  prefs.images_enabled =
-      per_tab_prefs_->GetBoolean(prefs::kWebKitImagesEnabled);
-  prefs.plugins_enabled =
-      per_tab_prefs_->GetBoolean(prefs::kWebKitPluginsEnabled);
-  prefs.standard_font_family =
-      UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitStandardFontFamily));
-  prefs.fixed_font_family =
-      UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitFixedFontFamily));
-  prefs.serif_font_family =
-      UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitSerifFontFamily));
-  prefs.sans_serif_font_family =
-      UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitSansSerifFontFamily));
-  prefs.cursive_font_family =
-      UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitCursiveFontFamily));
-  prefs.fantasy_font_family =
-      UTF8ToUTF16(per_tab_prefs_->GetString(prefs::kWebKitFantasyFontFamily));
-  prefs.default_font_size =
-      per_tab_prefs_->GetInteger(prefs::kWebKitDefaultFontSize);
-  prefs.default_fixed_font_size =
-      per_tab_prefs_->GetInteger(prefs::kWebKitDefaultFixedFontSize);
-  prefs.minimum_font_size =
-      per_tab_prefs_->GetInteger(prefs::kWebKitMinimumFontSize);
-  prefs.minimum_logical_font_size =
-      per_tab_prefs_->GetInteger(prefs::kWebKitMinimumLogicalFontSize);
-  prefs.xss_auditor_enabled =
-      per_tab_prefs_->GetBoolean(prefs::kWebKitXSSAuditorEnabled);
-  prefs.default_encoding =
-      per_tab_prefs_->GetString(prefs::kDefaultCharset);
-
-  web_contents()->GetRenderViewHost()->UpdateWebkitPreferences(prefs);
+  web_contents()->GetRenderViewHost()->UpdateWebkitPreferences(
+      rvhd->GetWebkitPrefs());
 }
 
 void PrefsTabHelper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       web_contents()->GetMutableRendererPrefs(), GetProfile());
   web_contents()->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 Profile* PrefsTabHelper::GetProfile() {
   return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 }