Index: chrome/browser/supervised_user/supervised_user_url_filter.h |
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.h b/chrome/browser/supervised_user/supervised_user_url_filter.h |
index e02792d07ee4f4518a4f645cf4950a9e0ae891c6..b532e5ecdf7d768f00d519684710c5cbe4377129 100644 |
--- a/chrome/browser/supervised_user/supervised_user_url_filter.h |
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.h |
@@ -18,6 +18,7 @@ |
#include "base/values.h" |
#include "chrome/browser/supervised_user/supervised_user_site_list.h" |
#include "chrome/browser/supervised_user/supervised_users.h" |
+#include "components/supervised_user_error_page/supervised_user_error_page.h" |
class GURL; |
class SupervisedUserBlacklist; |
@@ -51,25 +52,20 @@ class SupervisedUserURLFilter |
BLOCK, |
INVALID |
}; |
- enum FilteringBehaviorReason { |
- DEFAULT, |
- ASYNC_CHECKER, |
- BLACKLIST, |
- MANUAL, |
- WHITELIST |
- }; |
- using FilteringBehaviorCallback = base::Callback<void(FilteringBehavior, |
- FilteringBehaviorReason, |
- bool /* uncertain */)>; |
+ using FilteringBehaviorCallback = |
+ base::Callback<void(FilteringBehavior, |
+ supervised_user_error_page::FilteringBehaviorReason, |
+ bool /* uncertain */)>; |
class Observer { |
public: |
virtual void OnSiteListUpdated() = 0; |
- virtual void OnURLChecked(const GURL& url, |
- FilteringBehavior behavior, |
- FilteringBehaviorReason reason, |
- bool uncertain) {} |
+ virtual void OnURLChecked( |
+ const GURL& url, |
+ FilteringBehavior behavior, |
+ supervised_user_error_page::FilteringBehaviorReason reason, |
+ bool uncertain) {} |
}; |
struct Contents; |
@@ -78,14 +74,8 @@ class SupervisedUserURLFilter |
static FilteringBehavior BehaviorFromInt(int behavior_value); |
- static int GetBlockMessageID( |
- FilteringBehaviorReason reason, |
- bool is_child_account, |
- bool single_parent); |
- |
- static int GetBlockHeaderID(FilteringBehaviorReason reason); |
- |
- static bool ReasonIsAutomatic(FilteringBehaviorReason reason); |
+ static bool ReasonIsAutomatic( |
+ supervised_user_error_page::FilteringBehaviorReason reason); |
// Normalizes a URL for matching purposes. |
static GURL Normalize(const GURL& url); |
@@ -189,7 +179,9 @@ class SupervisedUserURLFilter |
void SetContents(scoped_ptr<Contents> url_matcher); |
FilteringBehavior GetFilteringBehaviorForURL( |
- const GURL& url, bool manual_only, FilteringBehaviorReason* reason) const; |
+ const GURL& url, |
+ bool manual_only, |
+ supervised_user_error_page::FilteringBehaviorReason* reason) const; |
void CheckCallback(const FilteringBehaviorCallback& callback, |
const GURL& url, |