Support manual (white|black)list, previewing and allowing after interstitial

chrome/browser/managed_mode/managed_mode.h

Index: chrome/browser/managed_mode/managed_mode.h
diff --git a/chrome/browser/managed_mode/managed_mode.h b/chrome/browser/managed_mode/managed_mode.h
index 1c8eba9228e4711ab37c2a9c968e7ab78f9b5817..7fc21603faf42a3e0528680ec2f4f525788efeaa 100644
--- a/chrome/browser/managed_mode/managed_mode.h
+++ b/chrome/browser/managed_mode/managed_mode.h
@@ -28,6 +28,10 @@ class PrefServiceSimple;
 class PrefServiceSyncable;
 class Profile;
 
+namespace policy{
+class URLBlacklist;
+}
+
 // Managed mode allows one person to manage the Chrome experience for another
 // person by pre-configuring and then locking a managed User profile.
 // The ManagedMode class provides methods to check whether the browser is in
@@ -62,6 +66,31 @@ class ManagedMode : public chrome::BrowserListObserver,
   // This method should only be called on the UI thread.
   static const ManagedModeURLFilter* GetURLFilterForUIThread();
 
+  // The functions that handle manual whitelists use |url_pattern| or lists
+  // of "url patterns". An "url pattern" is a pattern in the format used by the
+  // policy::URLBlacklist filter. A description of the format used can be found
+  // here: http://dev.chromium.org/administrators/url-blacklist-filter-format.
+
+  // Checks if the |url_pattern| is in the manual whitelist.

[Pam (message me for reviews), 2013/01/08 09:15:52]

"...whitelist (if |is_whitelist| is true) or blacklist (if not)."

+  static bool IsInManualList(const bool is_whitelist,
+                             const std::string& url_pattern);
+
+  // Appends |list| to the manual white/black list (according to |is_whitelist|)
+  // both in URL filter and in preferences.
+  static void AddToManualList(const bool is_whitelist,
+                              const base::ListValue& list);
+
+  // Removes |list| from the manual white/black list (according to
+  // |is_whitelist|) both in URL filter and in preferences.
+  static void RemoveFromManualList(const bool is_whitelist,
+                                   const base::ListValue& list);
+
+  // Updates the whitelist and the blacklist from the prefs.
+  static void UpdateManualLists();
+
+  // Returns the profile blacklist.
+  static scoped_ptr<base::ListValue> GetBlacklist();
+
   // ExtensionManagementPolicy::Provider implementation:
   virtual std::string GetDebugPolicyProviderName() const OVERRIDE;
   virtual bool UserMayLoad(const extensions::Extension* extension,
@@ -132,7 +161,29 @@ class ManagedMode : public chrome::BrowserListObserver,
 
   void OnDefaultFilteringBehaviorChanged();
 
-  void UpdateWhitelist();
+  void UpdateManualListsImpl();
+
+  // Returns a copy of the manual whitelist which is stored in each profile.
+  scoped_ptr<base::ListValue> GetWhitelist();
+
+  // The following functions use |is_whitelist| to select between the whitelist
+  // and the blacklist as the target of the function. If |is_whitelist| is true
+  // |url_pattern| is added to the whitelist, otherwise it is added to the
+  // blacklist.
+
+  void RemoveFromManualListImpl(const bool is_whitelist,
+                                const base::ListValue& whitelist);
+
+  // Adds the |url_pattern| to the manual lists in the URL filter. This is used
+  // by AddToManualListImpl().
+  void AddURLPatternToManualList(const bool is_whitelist,
+                                 const std::string& url_pattern);
+
+  void AddToManualListImpl(const bool is_whitelist,
+                           const base::ListValue& whitelist);
+
+  bool IsInManualListImpl(const bool is_whitelist,
+                          const std::string& url_pattern);
 
   content::NotificationRegistrar registrar_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;