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 ManagedModeURLFilter;
 class PrefChangeRegistrar;
 class PrefService;
 class Profile;
+namespace policy{

[Bernhard Bauer, 2012/11/16 15:04:46]

Please add a blank line before the namespace.

[Sergiu, 2012/11/26 14:48:08]

Done.

+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:
@@ skipping 19 matching lines @@
   // Returns the URL filter for the UI thread.
   // 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.

[Bernhard Bauer, 2012/11/16 15:04:46]

"[…] a copy of [the profile whitelist]"?

Also, it's not entirely clear what "profile whitelist" means here. Also, does
this need to be public?

[Sergiu, 2012/11/26 14:48:08]

Made it private, improved the comment.

+  static scoped_ptr<base::ListValue> GetWhitelist();
+
+  // Sets the profile whitelist to |whitelist|.
+  static void SetWhitelist(base::ListValue* whitelist);

[Bernhard Bauer, 2012/11/16 15:04:46]

What happens to the pointer that is passed in? Where is this used?

[Sergiu, 2012/11/26 14:48:08]

Deleted this function all together.

+
+  // Adds the |url| to the manual lists.

[Bernhard Bauer, 2012/11/16 15:04:46]

This is a URL *pattern*, right? So, we should call both the parameter that, and
update the method name accordingly.

[Sergiu, 2012/11/26 14:48:08]

Done.

+  static void AddStringToManualWhitelist(const std::string& url);
+  static void AddStringToManualBlacklist(const std::string& url);
+
+  // 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,
                            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 60 matching lines @@
   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_