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>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Browser;
 template<typename T>
 struct DefaultSingletonTraits;
 class ManagedModeSiteList;
 class ManagedModeURLFilter;
 class PrefChangeRegistrar;
 class PrefService;
 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,
@@ skipping 24 matching lines @@
   // classifying sites in the history view.
   // This method should only be called on the UI thread.
   static const ManagedModeURLFilter* GetURLFilterForUIThread();
 
   // Returns the URL's category.
   static int GetCategory(const GURL& url);
 
   // Called in the critical path of drawing the history UI, so needs to be fast.
   static void GetCategoryNames(CategoryList* list);
 
-  // Returns the profile whitelist.
-  static scoped_ptr<base::ListValue> GetWhitelist();
+  // Checks if the url pattern is in the manual whitelist.
+  static bool IsInManualWhitelist(const std::string& url_pattern);
 
-  // Sets the profile whitelist to |whitelist|.
-  static void SetWhitelist(base::ListValue* whitelist);
+  // Appends |whitelist| to the manual whitelist(both in URL filter and in

[Bernhard Bauer, 2012/11/26 16:06:30]

Nit: space before opening parenthesis.

[Sergiu, 2012/11/27 15:37:34]

Done.

+  // preferences).
+  static bool AddToManualWhitelist(const base::ListValue& whitelist);

[Bernhard Bauer, 2012/11/26 16:06:30]

What does the return value mean?

[Sergiu, 2012/11/27 15:37:34]

Done.

 
-  // Adds the |url| to the manual lists.
-  static void AddStringToManualWhitelist(const std::string& url);
-  static void AddStringToManualBlacklist(const std::string& url);
+  // Adds the |url_patter| to the manual lists in the URL filter.

[Bernhard Bauer, 2012/11/26 16:06:30]

Nit: |url_pattern|

[Sergiu, 2012/11/27 15:37:34]

Done.

+  static void AddURLPatternToManualWhitelist(const std::string& url_pattern);
+  static void AddURLPatternToManualBlacklist(const std::string& url_pattern);
 
   // Returns the profile blacklist.
   static scoped_ptr<base::ListValue> GetBlacklist();

[Bernhard Bauer, 2012/11/26 16:06:30]

Is this method used?

[Sergiu, 2012/11/27 15:37:34]

Not right now but it will almost surely be used in the future when we add a way
to edit the manual blacklist. Should I delete it until then?

[Bernhard Bauer, 2012/11/27 18:44:46]

It's fine if you move it together with GetWhiteList().

 
   // 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;
@@ skipping 55 matching lines @@
 
   // 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 OnFamilyPackOptionsChanged();
 
   void UpdateWhitelist();
 
+  // Returns a copy of the manual whitelist which is stored in each profile.
+  static scoped_ptr<base::ListValue> GetWhitelist();

[Bernhard Bauer, 2012/11/26 16:06:30]

If this method is private, we don't need a separate Impl() method. Also, is this
method even used now?

[Sergiu, 2012/11/27 15:37:34]

Yes, it is by ManagedMode::UpdateWhitelist. Initially it was public but since it
was only used in the ManagedMode class I made it private. But yeah, static
private methods don't make a lot of sense :).

+  scoped_ptr<base::ListValue> GetWhitelistImpl();
+
   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_