Split incognito extension content settings in session-only and persistent.

chrome/browser/extensions/extension_content_settings_store.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_STORE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_STORE_H_
 
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "base/time.h"
 #include "base/tuple.h"
 #include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
+#include "chrome/browser/extensions/extension_prefs_scope.h"
 #include "chrome/common/content_settings.h"
 #include "googleurl/src/gurl.h"
 
 class DictionaryValue;
 class ListValue;
 
 // This class is the backend for extension-defined content settings. It is used
 // by the content_settings::ExtensionProvider to integrate its settings into the
 // HostContentSettingsMap and by the content settings extension API to provide
 // extensions with access to content settings.
@@ skipping 24 matching lines @@
   // incognito mode only.
   // Precondition: the extension must be registered.
   // This method should only be called on the UI thread.
   void SetExtensionContentSetting(
       const std::string& ext_id,
       const ContentSettingsPattern& embedded_pattern,
       const ContentSettingsPattern& top_level_pattern,
       ContentSettingsType type,
       const content_settings::ResourceIdentifier& identifier,
       ContentSetting setting,
-      bool incognito);
+      extension_prefs_scope::Scope scope);
 
   ContentSetting GetEffectiveContentSetting(
       const GURL& embedded_url,
       const GURL& top_level_url,
       ContentSettingsType type,
       const content_settings::ResourceIdentifier& identifier,
       bool incognito) const;
 
+  // Clears all contents settings set by the extension |ext_id|.
+  void ClearContentSettingsForExtension(const std::string& ext_id,
+                                        extension_prefs_scope::Scope scope);
+
   // Returns a list of all content setting rules for the content type |type|
   // and the resource identifier (if specified and the content type uses
   // resource identifiers).
   void GetContentSettingsForContentType(
       ContentSettingsType type,
       const content_settings::ResourceIdentifier& identifier,
       bool incognito,
       content_settings::ProviderInterface::Rules* rules) const;
 
   // Serializes all content settings set by the extension with ID |extension_id|
   // and returns them as a ListValue. The caller takes ownership of the returned
   // value.
-  ListValue* GetSettingsForExtension(const std::string& extension_id) const;
+  ListValue* GetSettingsForExtension(const std::string& extension_id,
+                                     extension_prefs_scope::Scope scope) const;
 
   // Deserializes content settings rules from |list| and applies them as set by
   // the extension with ID |extension_id|.
   void SetExtensionContentSettingsFromList(const std::string& extension_id,
-                                           const ListValue* dict);
+                                           const ListValue* dict,

[battre, 2011/06/03 18:48:36]

nit: |dict| -> |list| (see line 92)

[Bernhard Bauer, 2011/06/03 20:34:28]

Done.

+                                           extension_prefs_scope::Scope scope);
 
   // //////////////////////////////////////////////////////////////////////////
 
   // Registers the time when an extension |ext_id| is installed.
   void RegisterExtension(const std::string& ext_id,
                          const base::Time& install_time,
                          bool is_enabled);
 
   // Deletes all entries related to extension |ext_id|.
   void UnregisterExtension(const std::string& ext_id);
@@ skipping 30 matching lines @@
 
   ContentSetting GetContentSettingFromSpecList(
       const GURL& embedded_url,
       const GURL& top_level_url,
       ContentSettingsType type,
       const content_settings::ResourceIdentifier& identifier,
       const ContentSettingSpecList& setting_spec_list) const;
 
   ContentSettingSpecList* GetContentSettingSpecList(
       const std::string& ext_id,
-      bool incognito);
+      extension_prefs_scope::Scope scope);
 
   const ContentSettingSpecList* GetContentSettingSpecList(
       const std::string& ext_id,
-      bool incognito) const;
+      extension_prefs_scope::Scope scope) const;
+
+  static void AddRules(ContentSettingsType type,

[battre, 2011/06/03 18:48:36]

Add a comment?

[Bernhard Bauer, 2011/06/03 20:34:28]

Done.

+                       const content_settings::ResourceIdentifier& identifier,
+                       content_settings::ProviderInterface::Rules* rules,
+                       const ContentSettingSpecList* setting_spec_list);

[battre, 2011/06/03 18:48:36]

Order of parameters: You search for a match of |type| and |identifier| in
|setting_spec_list|. Make |setting_spec_list| the third parameter?

[Bernhard Bauer, 2011/06/03 20:34:28]

Good idea. Done.

 
   void NotifyOfContentSettingChanged(const std::string& extension_id,
                                      bool incognito);
 
   void NotifyOfDestruction();
 
   bool OnCorrectThread();
 
   ExtensionEntryMap entries_;
 
   ObserverList<Observer, false> observers_;
 
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionContentSettingsStore);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_STORE_H_