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

chrome/browser/managed_mode/managed_mode.h

 // Copyright (c) 2012 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_MANAGED_MODE_MANAGED_MODE_H_
 #define CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 class Browser;
 template<typename T>
 struct DefaultSingletonTraits;
 class ManagedModeSiteList;
 class ManagedModeURLFilter;
 class PrefChangeRegistrar;
 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
 // managed mode, and to attempt to enter or leave managed mode.
 // Except where otherwise noted, this class should be used on the UI thread.
 class ManagedMode : public chrome::BrowserListObserver,
                     public extensions::ManagementPolicy::Provider,
                     public content::NotificationObserver {
  public:
   typedef base::Callback<void(bool)> EnterCallback;
+  typedef base::ListValue URLPatternList;
 
   static void RegisterPrefs(PrefServiceSimple* prefs);
   static void RegisterUserPrefs(PrefServiceSyncable* prefs);
 
   // Initializes the singleton, setting the managed_profile_. Must be called
   // after g_browser_process and the LocalState have been created.
   static void Init(Profile* profile);
   static bool IsInManagedMode();
 
   // Calls |callback| with the argument true iff managed mode was entered
   // sucessfully.
   static void EnterManagedMode(Profile* profile, const EnterCallback& callback);
   static void LeaveManagedMode();
 
   // Returns the URL filter for the IO thread, for filtering network requests
   // (in ChromeNetworkDelegate).
   // This method should only be called on the IO thread.
   static const ManagedModeURLFilter* GetURLFilterForIOThread();
 
   // Returns the URL filter for the UI thread, for filtering navigations and
   // classifying sites in the history view.
   // 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
+  // URLBlacklist filter. A description of the format used can be found here:

[Bernhard Bauer, 2013/01/07 12:34:19]

Nit: policy::URLBacklist is the fully qualified class name, and it tells readers
what area the class is coming from.

[Sergiu, 2013/01/07 16:25:05]

Done.

+  // http://dev.chromium.org/administrators/url-blacklist-filter-format
+
+  // Checks if the |url_pattern| is in the manual whitelist.
+  static bool IsInManualList(const bool isWhitelist,

[Pam (message me for reviews), 2013/01/07 13:00:16]

Style nit: is_whitelist (also below)
Comment nit: Describe |is_whitelist|

[Sergiu, 2013/01/07 16:25:05]

Done.

+                             const std::string& url_pattern);
+
+  // Appends |list| to the manual white/black list (according to |isWhitelist|)
+  // both in URL filter and in preferences.
+  static void AddToManualList(const bool isWhitelist,
+                              const URLPatternList& list);
+
+  // Removes |list| from the manual white/black list (according to
+  // |isWhitelist|) both in URL filter and in preferences.
+  static void RemoveFromManualList(const bool isWhitelist,
+                                   const URLPatternList& list);
+
+  // Updates the whitelist and the blacklist from the prefs.
+  static void UpdateWhitelist();

[Pam (message me for reviews), 2013/01/07 13:00:16]

If this updates both the white- and blacklists, it should have a better name.
UpdateURLFilteringLists
UpdateWhiteAndBlacklists

[Sergiu, 2013/01/07 16:25:05]

Done, renamed to UpdateManualLists to fit with the other functions.

+
+  // Returns the profile blacklist.
+  static scoped_ptr<URLPatternList> GetBlacklist();
+
   // ExtensionManagementPolicy::Provider implementation:
   virtual std::string GetDebugPolicyProviderName() const OVERRIDE;
   virtual bool UserMayLoad(const extensions::Extension* extension,
                            string16* error) const OVERRIDE;
   virtual bool UserMayModifySettings(const extensions::Extension* extension,
                                      string16* error) const OVERRIDE;
 
   // chrome::BrowserListObserver implementation:
   virtual void OnBrowserAdded(Browser* browser) OVERRIDE;
   virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
@@ skipping 50 matching lines @@
   // testing).
   virtual void SetInManagedMode(Profile* newly_managed_profile);
 
   // Returns a list of all installed and enabled site lists in the current
   // managed profile.
   // This method should only be called if managed mode is active.
   ScopedVector<ManagedModeSiteList> GetActiveSiteLists();
 
   void OnDefaultFilteringBehaviorChanged();
 
-  void UpdateWhitelist();
+  void UpdateWhitelistImpl();
+
+  // Returns a copy of the manual whitelist which is stored in each profile.
+  scoped_ptr<URLPatternList> GetWhitelist();
+
+  void RemoveFromManualListImpl(const bool isWhitelist,
+                                const URLPatternList& whitelist);
+
+  // Adds the |url_pattern| to the manual lists in the URL filter. This is used
+  // by AddToManualListImpl().
+  static void AddURLPatternToManualList(const bool isWhitelist,

[Bernhard Bauer, 2013/01/07 12:34:19]

Can you move this method to an anonymous namespace? Static private methods
always trigger a flag for me :)

[Sergiu, 2013/01/07 16:25:05]

It shouldn't have been static at all, made it just private and it should be ok.

+                                        const std::string& url_pattern);
+
+  void AddToManualListImpl(const bool isWhitelist,
+                           const URLPatternList& whitelist);
+
+  bool IsInManualListImpl(const bool isWhitelist,
+                          const std::string& url_pattern);
 
   content::NotificationRegistrar registrar_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
 
   scoped_ptr<URLFilterContext> io_url_filter_context_;
   scoped_ptr<URLFilterContext> ui_url_filter_context_;
 
   std::set<Browser*> browsers_to_close_;
   std::vector<EnterCallback> callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedMode);
 };
 
 #endif  // CHROME_BROWSER_MANAGED_MODE_MANAGED_MODE_H_