Introduce per-tab preferences service.

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/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 "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 107 matching lines @@
   ConfigurationPolicyPrefStore* managed_cloud = NULL;
   ConfigurationPolicyPrefStore* recommended_platform = NULL;
   ConfigurationPolicyPrefStore* recommended_cloud = NULL;
 #endif  // ENABLE_CONFIGURATION_POLICY
 
   CommandLinePrefStore* command_line =
       new CommandLinePrefStore(CommandLine::ForCurrentProcess());
   JsonPrefStore* user = new JsonPrefStore(
       pref_filename,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
-  DefaultPrefStore* default_pref_store = new DefaultPrefStore();
 
   return new PrefService(
-      managed_platform, managed_cloud, extension_prefs,
-      command_line, user, recommended_platform,
-      recommended_cloud, default_pref_store, async);
+      managed_platform,
+      managed_cloud,
+      extension_prefs,
+      command_line,
+      user,
+      recommended_platform,
+      recommended_cloud,
+      async);
 }
 
 PrefService* PrefService::CreateIncognitoPrefService(
     PrefStore* incognito_extension_prefs) {
-  return new PrefService(*this, incognito_extension_prefs);
+  return new PrefService(
+      pref_value_store_.get(),
+      NULL, // managed_platform_prefs
+      NULL, // managed_cloud_prefs
+      incognito_extension_prefs,
+      NULL, // command_line_prefs
+      new IncognitoUserPrefStore(user_pref_store_.get()),
+      NULL, // recommended_platform_prefs
+      NULL, // recommended_cloud_prefs
+      default_store_.get());

[Mattias Nissler (ping if slow), 2011/11/17 18:44:39]

You pass in the default store as the async parameter here! Note that the default
store must be passed in for incognito since, it's the default store that
determines which prefs are registered.

[mnaganov (inactive), 2011/11/17 19:53:32]

I hope no. Those two constructors differ by the number of arguments. Here the
second version should be selected.

+}
+
+PrefService* PrefService::CreatePrefServiceWithPerTabPrefStore() {
+  return new PrefService(
+      pref_value_store_.get(),
+      NULL, // managed_platform_prefs
+      NULL, // managed_cloud_prefs
+      NULL, // extension_prefs
+      NULL, // command_line_prefs
+      new PerTabUserPrefStore(user_pref_store_.get()),
+      NULL, // recommended_platform_prefs
+      NULL, // recommended_cloud_prefs
+      new DefaultPrefStore());
 }
 
 PrefService::PrefService(PrefStore* managed_platform_prefs,
                          PrefStore* managed_cloud_prefs,
                          PrefStore* extension_prefs,
                          PrefStore* command_line_prefs,
                          PersistentPrefStore* user_prefs,
                          PrefStore* recommended_platform_prefs,
                          PrefStore* recommended_cloud_prefs,
-                         DefaultPrefStore* default_store,
                          bool async)
-    : user_pref_store_(user_prefs),
-      default_store_(default_store) {
-  pref_sync_associator_.reset(new PrefModelAssociator(this));
-  pref_notifier_.reset(new PrefNotifierImpl(this));
-  pref_value_store_.reset(
-      new PrefValueStore(managed_platform_prefs,
-                         managed_cloud_prefs,
-                         extension_prefs,
-                         command_line_prefs,
-                         user_pref_store_,
-                         recommended_platform_prefs,
-                         recommended_cloud_prefs,
-                         default_store,
-                         pref_sync_associator_.get(),
-                         pref_notifier_.get()));
+    : pref_notifier_(new PrefNotifierImpl(this)),
+      user_pref_store_(user_prefs),
+      default_store_(new DefaultPrefStore()),

[Mattias Nissler (ping if slow), 2011/11/17 18:44:39]

As I mentioned above, that'll break the incognito pref service.

[mnaganov (inactive), 2011/11/17 19:53:32]

Ditto. For the incognito mode, the second constructor should be called.

+      pref_sync_associator_(new PrefModelAssociator(this)),
+      pref_value_store_(new PrefValueStore(
+          managed_platform_prefs,
+          managed_cloud_prefs,
+          extension_prefs,
+          command_line_prefs,
+          user_prefs,
+          recommended_platform_prefs,
+          recommended_cloud_prefs,
+          default_store_,
+          pref_sync_associator_.get(),
+          pref_notifier_.get())) {
   InitFromStorage(async);
 }
 
-PrefService::PrefService(const PrefService& original,
-                         PrefStore* incognito_extension_prefs)
-      : user_pref_store_(
-            new IncognitoUserPrefStore(original.user_pref_store_.get())),
-        default_store_(original.default_store_.get()) {
-  // Incognito mode doesn't sync, so no need to create PrefModelAssociator.
-  pref_notifier_.reset(new PrefNotifierImpl(this));
-  pref_value_store_.reset(original.pref_value_store_->CloneAndSpecialize(
-      NULL, // managed_platform_prefs
-      NULL, // managed_cloud_prefs
-      incognito_extension_prefs,
-      NULL, // command_line_prefs
-      user_pref_store_.get(),
-      NULL, // recommended_platform_prefs
-      NULL, // recommended_cloud_prefs
-      default_store_.get(),
-      NULL, // pref_sync_associator_
-      pref_notifier_.get()));
+PrefService::PrefService(PrefValueStore* source_store,
+                         PrefStore* managed_platform_prefs,
+                         PrefStore* managed_cloud_prefs,
+                         PrefStore* extension_prefs,
+                         PrefStore* command_line_prefs,
+                         PersistentPrefStore* user_prefs,
+                         PrefStore* recommended_platform_prefs,
+                         PrefStore* recommended_cloud_prefs,
+                         DefaultPrefStore* default_store)
+    : pref_notifier_(new PrefNotifierImpl(this)),
+      user_pref_store_(user_prefs),
+      default_store_(default_store),
+      pref_sync_associator_(NULL),
+      pref_value_store_(source_store->CloneAndSpecialize(
+          managed_platform_prefs,
+          managed_cloud_prefs,
+          extension_prefs,
+          command_line_prefs,
+          user_prefs,
+          recommended_platform_prefs,
+          recommended_cloud_prefs,
+          default_store_,
+          pref_sync_associator_.get(),
+          pref_notifier_.get())) {
+  InitFromStorage(false);
 }
 
 PrefService::~PrefService() {
   DCHECK(CalledOnValidThread());
   STLDeleteContainerPointers(prefs_.begin(), prefs_.end());
   prefs_.clear();
 
   // Reset pointers so accesses after destruction reliably crash.
   pref_value_store_.reset();
   user_pref_store_ = NULL;
@@ skipping 674 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());
 }