Get rid of trivial IncognitoUserPrefStore and PerTabUserPrefStore.

chrome/browser/prefs/pref_service.cc

 // 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.
 
 #include "chrome/browser/prefs/pref_service.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/value_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/default_pref_store.h"
-#include "chrome/browser/prefs/incognito_user_pref_store.h"
-#include "chrome/browser/prefs/per_tab_user_pref_store.h"
+#include "chrome/browser/prefs/overlay_user_pref_store.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/common/json_pref_store.h"
+#include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // A helper function for RegisterLocalized*Pref that creates a Value* based on
@@ skipping 60 matching lines @@
       if (message_id) {
         BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
             base::Bind(&NotifyReadError, message_id));
       }
       UMA_HISTOGRAM_ENUMERATION("PrefService.ReadError", error,
                                 PersistentPrefStore::PREF_READ_ERROR_MAX_ENUM);
     }
   }
 };
 
+static void InitIncognitoUserPrefStore(OverlayUserPrefStore* pref_store) {

[Bernhard Bauer, 2011/12/30 17:54:16]

You could move this into browser_prefs.cc, where the other pref registrations
are.

+  // 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 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 underlay
+  // 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::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);
+}
+
 }  // namespace
 
 // static
 PrefService* PrefService::CreatePrefService(const FilePath& pref_filename,
                                             PrefStore* extension_prefs,
                                             bool async) {
   using policy::ConfigurationPolicyPrefStore;
 
 #if defined(OS_LINUX)
   // We'd like to see what fraction of our users have the preferences
@@ skipping 49 matching lines @@
           pref_notifier),
       user,
       default_pref_store,
       pref_sync_associator,
       async);
 }
 
 PrefService* PrefService::CreateIncognitoPrefService(
     PrefStore* incognito_extension_prefs) {
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
-  PersistentPrefStore* incognito_pref_store =
-      new IncognitoUserPrefStore(user_pref_store_.get());
+  OverlayUserPrefStore* incognito_pref_store =
+      new OverlayUserPrefStore(user_pref_store_.get());
+  InitIncognitoUserPrefStore(incognito_pref_store);
   return new PrefService(
       pref_notifier,
       pref_value_store_->CloneAndSpecialize(
           NULL, // managed_platform_prefs
           NULL, // managed_cloud_prefs
           incognito_extension_prefs,
           NULL, // command_line_prefs
           incognito_pref_store,
           NULL, // recommended_platform_prefs
           NULL, // recommended_cloud_prefs
           default_store_.get(),
           NULL, // pref_sync_associator
           pref_notifier),
       incognito_pref_store,
       default_store_.get(),
       NULL,
       false);
 }
 
 PrefService* PrefService::CreatePrefServiceWithPerTabPrefStore() {
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
-  PersistentPrefStore* per_tab_pref_store =
-      new PerTabUserPrefStore(user_pref_store_.get());
+  OverlayUserPrefStore* per_tab_pref_store =
+      new OverlayUserPrefStore(user_pref_store_.get());
+  InitPerTabUserPrefStore(per_tab_pref_store);
   DefaultPrefStore* default_store = new DefaultPrefStore();
   return new PrefService(
       pref_notifier,
       pref_value_store_->CloneAndSpecialize(
           NULL, // managed_platform_prefs
           NULL, // managed_cloud_prefs
           NULL, // extension_prefs
           NULL, // command_line_prefs
           per_tab_pref_store,
           NULL, // recommended_platform_prefs
@@ skipping 722 matching lines @@
   return pref_value_store()->PrefValueFromDefaultStore(name_.c_str());
 }
 
 bool PrefService::Preference::IsUserModifiable() const {
   return pref_value_store()->PrefValueUserModifiable(name_.c_str());
 }
 
 bool PrefService::Preference::IsExtensionModifiable() const {
   return pref_value_store()->PrefValueExtensionModifiable(name_.c_str());
 }