Index: chrome/browser/managed_mode/managed_mode_url_filter.h |
diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.h b/chrome/browser/managed_mode/managed_mode_url_filter.h |
index 12e6debbe116e4e057cc2ea5882ec5967156a24f..a2334cb0fe99c826e69a445f1460b9f905da9289 100644 |
--- a/chrome/browser/managed_mode/managed_mode_url_filter.h |
+++ b/chrome/browser/managed_mode/managed_mode_url_filter.h |
@@ -12,6 +12,7 @@ |
#include "base/threading/non_thread_safe.h" |
#include "base/values.h" |
#include "chrome/browser/managed_mode/managed_mode_site_list.h" |
+#include "chrome/browser/policy/url_blacklist_manager.h" |
class FilePath; |
class GURL; |
@@ -51,6 +52,17 @@ class ManagedModeURLFilter : public base::NonThreadSafe { |
void SetWhitelist(const std::vector<std::string>& patterns, |
const base::Closure& continuation); |
+ // Sets the manual whitelists |
Bernhard Bauer
2012/11/16 15:04:46
Nit: Punctuation at the end of the sentence please
Sergiu
2012/11/26 14:48:08
Done.
|
+ void SetManualLists(scoped_ptr<ListValue> whitelist, |
+ scoped_ptr<ListValue> blacklist, |
+ const base::Closure& continuation); |
+ |
+ void AddStringToManualBlacklist(const std::string& url, |
+ const base::Closure& continuation); |
+ |
+ void AddStringToManualWhitelist(const std::string& url, |
+ const base::Closure& continuation); |
+ |
private: |
void SetContents(const base::Closure& callback, |
scoped_ptr<Contents> url_matcher); |
@@ -58,6 +70,11 @@ class ManagedModeURLFilter : public base::NonThreadSafe { |
base::WeakPtrFactory<ManagedModeURLFilter> weak_ptr_factory_; |
FilteringBehavior behavior_; |
scoped_ptr<Contents> contents_; |
+ // The |url_manual_list_allow_| blocks all URLs except the one that are |
Bernhard Bauer
2012/11/16 15:04:46
Nit: Blank line before this would be nice.
Also:
Sergiu
2012/11/26 14:48:08
Done.
|
+ // added while the |url_manual_list_block_| blocks only the URLs that are |
+ // added to it. |
+ policy::URLBlacklist url_manual_list_allow_; |
+ policy::URLBlacklist url_manual_list_block_; |
DISALLOW_COPY_AND_ASSIGN(ManagedModeURLFilter); |
}; |