Support persistent incognito preferences

chrome/browser/extensions/extension_pref_value_map.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/extensions/extension_pref_value_map.h"
 
 #include "base/stl_util-inl.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 
 struct ExtensionPrefValueMap::ExtensionEntry {
   // Installation time of the extension.
   base::Time install_time;
   // Whether extension is enabled in the profile.
   bool enabled;
   // Regular preferences.
   PrefValueMap reg_preferences;
-  // Incognito preferences, empty for regular ExtensionPrefStore.
-  PrefValueMap inc_preferences;
+  // Persistent incognito preferences, empty for regular ExtensionPrefStore.
+  PrefValueMap inc_preferences_persistent;
 };
 
 ExtensionPrefValueMap::ExtensionPrefValueMap() {
 }
 
 ExtensionPrefValueMap::~ExtensionPrefValueMap() {
   NotifyOfDestruction();
   STLDeleteValues(&entries_);
   entries_.clear();
 }
 
 void ExtensionPrefValueMap::SetExtensionPref(const std::string& ext_id,
                                              const std::string& key,
-                                             bool incognito,
+                                             extension_prefs_scope::Scope scope,
                                              Value* value) {
-  PrefValueMap* prefs = GetExtensionPrefValueMap(ext_id, incognito);
+  PrefValueMap* prefs = GetExtensionPrefValueMap(ext_id, scope);
 
   if (prefs->SetValue(key, value))
     NotifyPrefValueChanged(key);
 }
 
-void ExtensionPrefValueMap::RemoveExtensionPref(const std::string& ext_id,
-                                                const std::string& key,
-                                                bool incognito) {
-  PrefValueMap* prefs = GetExtensionPrefValueMap(ext_id, incognito);
+void ExtensionPrefValueMap::RemoveExtensionPref(
+    const std::string& ext_id,
+    const std::string& key,
+    extension_prefs_scope::Scope scope) {
+  PrefValueMap* prefs = GetExtensionPrefValueMap(ext_id, scope);
   if (prefs->RemoveValue(key))
     NotifyPrefValueChanged(key);
 }
 
 bool ExtensionPrefValueMap::CanExtensionControlPref(
     const std::string& extension_id,
     const std::string& pref_key,
     bool incognito) const {
   ExtensionEntryMap::const_iterator ext = entries_.find(extension_id);
   if (ext == entries_.end()) {
@@ skipping 53 matching lines @@
   if (i->second->enabled == is_enabled)
     return;
   std::set<std::string> keys;  // keys set by this extension
   GetExtensionControlledKeys(*(i->second), &keys);
   i->second->enabled = is_enabled;
   NotifyPrefValueChanged(keys);
 }
 
 PrefValueMap* ExtensionPrefValueMap::GetExtensionPrefValueMap(
     const std::string& ext_id,
-    bool incognito) {
+    extension_prefs_scope::Scope scope) {
   ExtensionEntryMap::const_iterator i = entries_.find(ext_id);
   CHECK(i != entries_.end());
-  return incognito ? &(i->second->inc_preferences)
-                   : &(i->second->reg_preferences);
+  switch (scope) {
+    case extension_prefs_scope::kRegular:
+      return &(i->second->reg_preferences);

[Matt Perry, 2011/05/24 21:04:56]

Per the style guide, avoid abbrevs.

[battre, 2011/05/25 11:31:45]

Done.

+    case extension_prefs_scope::kIncognitoPersistent:
+      return &(i->second->inc_preferences_persistent);
+  }
 }
 
 const PrefValueMap* ExtensionPrefValueMap::GetExtensionPrefValueMap(
     const std::string& ext_id,
-    bool incognito) const {
+    extension_prefs_scope::Scope scope) const {
   ExtensionEntryMap::const_iterator i = entries_.find(ext_id);
   CHECK(i != entries_.end());
-  return incognito ? &(i->second->inc_preferences)
-                   : &(i->second->reg_preferences);
+  switch (scope) {
+    case extension_prefs_scope::kRegular:
+      return &(i->second->reg_preferences);
+    case extension_prefs_scope::kIncognitoPersistent:
+      return &(i->second->inc_preferences_persistent);
+  }
 }
 
 void ExtensionPrefValueMap::GetExtensionControlledKeys(
     const ExtensionEntry& entry,
     std::set<std::string>* out) const {
   PrefValueMap::const_iterator i;
 
   const PrefValueMap& reg_prefs = entry.reg_preferences;
   for (i = reg_prefs.begin(); i != reg_prefs.end(); ++i)
     out->insert(i->first);
 
-  const PrefValueMap& inc_prefs = entry.inc_preferences;
-  for (i = inc_prefs.begin(); i != inc_prefs.end(); ++i)
+  const PrefValueMap& inc_prefs_pers = entry.inc_preferences_persistent;
+  for (i = inc_prefs_pers.begin(); i != inc_prefs_pers.end(); ++i)
     out->insert(i->first);
 }
 
 const Value* ExtensionPrefValueMap::GetEffectivePrefValue(
     const std::string& key,
     bool incognito,
     bool* from_incognito) const {
   ExtensionEntryMap::const_iterator winner =
       GetEffectivePrefValueController(key, incognito, from_incognito);
   if (winner == entries_.end())
     return NULL;
 
   const Value* value = NULL;
   const std::string& ext_id = winner->first;
-  if (incognito)
-    GetExtensionPrefValueMap(ext_id, true)->GetValue(key, &value);
-  if (!value)
-    GetExtensionPrefValueMap(ext_id, false)->GetValue(key, &value);
+  if (incognito) {
+    const PrefValueMap* prefs = GetExtensionPrefValueMap(
+        ext_id, extension_prefs_scope::kIncognitoPersistent);
+    prefs->GetValue(key, &value);
+  }
+  if (!value) {
+    const PrefValueMap* prefs = GetExtensionPrefValueMap(
+        ext_id, extension_prefs_scope::kRegular);
+    prefs->GetValue(key, &value);
+  }
   return value;
 }
 
 ExtensionPrefValueMap::ExtensionEntryMap::const_iterator
 ExtensionPrefValueMap::GetEffectivePrefValueController(
     const std::string& key,
     bool incognito,
     bool* from_incognito) const {
   ExtensionEntryMap::const_iterator winner = entries_.end();
   base::Time winners_install_time;
 
   ExtensionEntryMap::const_iterator i;
   for (i = entries_.begin(); i != entries_.end(); ++i) {
     const std::string& ext_id = i->first;
     const base::Time& install_time = i->second->install_time;
     const bool enabled = i->second->enabled;
 
     if (!enabled)
       continue;
     if (install_time < winners_install_time)
       continue;
 
     const Value* value = NULL;
-    const PrefValueMap* prefs = GetExtensionPrefValueMap(ext_id, false);
+    const PrefValueMap* prefs = GetExtensionPrefValueMap(
+        ext_id, extension_prefs_scope::kRegular);
     if (prefs->GetValue(key, &value)) {
       winner = i;
       winners_install_time = install_time;
       if (from_incognito)
         *from_incognito = false;
     }
 
     if (!incognito)
       continue;
 
-    prefs = GetExtensionPrefValueMap(ext_id, true);
+    prefs = GetExtensionPrefValueMap(
+        ext_id, extension_prefs_scope::kIncognitoPersistent);
     if (prefs->GetValue(key, &value)) {
       winner = i;
       winners_install_time = install_time;
       if (from_incognito)
         *from_incognito = true;
     }
   }
   return winner;
 }
 
@@ skipping 31 matching lines @@
 
 void ExtensionPrefValueMap::NotifyPrefValueChanged(const std::string& key) {
   FOR_EACH_OBSERVER(ExtensionPrefValueMap::Observer, observers_,
                     OnPrefValueChanged(key));
 }
 
 void ExtensionPrefValueMap::NotifyOfDestruction() {
   FOR_EACH_OBSERVER(ExtensionPrefValueMap::Observer, observers_,
                     OnExtensionPrefValueMapDestruction());
 }