Introduce incognito preference settings.

chrome/browser/extensions/extension_pref_store.cc

Index: chrome/browser/extensions/extension_pref_store.cc
diff --git a/chrome/browser/extensions/extension_pref_store.cc b/chrome/browser/extensions/extension_pref_store.cc
index b3aba4482c86285d16a237798fb3c00277b040d4..a174b5e2625bdfffc5544f52f8f5efab3770cf95 100644
--- a/chrome/browser/extensions/extension_pref_store.cc
+++ b/chrome/browser/extensions/extension_pref_store.cc
@@ -1,28 +1,43 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/extensions/extension_pref_store.h"
 
-ExtensionPrefStore::ExtensionPrefStore()
-    : initialization_complete_(false) {
-}
+#include "base/values.h"
+#include "chrome/browser/extensions/extension_pref_value_map.h"
 
-void ExtensionPrefStore::SetExtensionPref(const std::string& key,
-                                          Value* value) {
-  SetValue(key, value);
+ExtensionPrefStore::ExtensionPrefStore(
+    ExtensionPrefValueMap* extension_pref_value_map,
+    bool incognito_pref_store)
+    : extension_pref_value_map_(extension_pref_value_map),
+      incognito_pref_store_(incognito_pref_store) {
+  if (extension_pref_value_map_)

[Mattias Nissler (ping if slow), 2011/01/07 10:12:58]

Why the conditional? This parameter should always be non-null, no?

[battre, 2011/01/10 16:55:47]

Done.

+    extension_pref_value_map_->AddObserver(this);
 }
 
-void ExtensionPrefStore::RemoveExtensionPref(const std::string& key) {
-  RemoveValue(key);
+ExtensionPrefStore::~ExtensionPrefStore() {
+  if (extension_pref_value_map_)
+    extension_pref_value_map_->RemoveObserver(this);
 }
 
 void ExtensionPrefStore::OnInitializationCompleted() {
-  DCHECK(!initialization_complete_);
-  initialization_complete_ = true;
   NotifyInitializationCompleted();
 }
 
-bool ExtensionPrefStore::IsInitializationComplete() const {
-  return initialization_complete_;
+void ExtensionPrefStore::OnPrefValueChanged(const std::string& key) {
+  CHECK(extension_pref_value_map_);
+  const Value *winner =
+      extension_pref_value_map_->GetEffectivePrefValue(key,
+                                                       incognito_pref_store_);
+  if (winner)
+    SetValue(key, winner->DeepCopy());
+  else
+    RemoveValue(key);
+}
+
+void ExtensionPrefStore::OnExtensionPrefValueMapDestruction() {
+  CHECK(extension_pref_value_map_);
+  extension_pref_value_map_->RemoveObserver(this);
+  extension_pref_value_map_ = NULL;
 }