Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2068)

Unified Diff: chrome/browser/supervised_user/supervised_user_url_filter.cc

Issue 2568953002: Revert of Supervised Users: Create ResourceThrottle only if filtering is enabled (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/supervised_user_url_filter.cc
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc
index dfece48403fa0ac6a39d594ad43760092df34ab8..5318b1bf28dbae99b0708f0830cd0f0ab649f8a2 100644
--- a/chrome/browser/supervised_user/supervised_user_url_filter.cc
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc
@@ -231,8 +231,7 @@
} // namespace
SupervisedUserURLFilter::SupervisedUserURLFilter()
- : enabled_(false),
- default_behavior_(ALLOW),
+ : default_behavior_(ALLOW),
contents_(new Contents()),
blacklist_(nullptr),
amp_cache_path_regex_(kAmpCachePathPattern),
@@ -324,16 +323,6 @@
return trimmed_host == trimmed_pattern;
}
-void SupervisedUserURLFilter::SetEnabled(bool enabled) {
- if (enabled_ == enabled)
- return;
-
- enabled_ = enabled;
-
- for (Observer& observer : observers_)
- observer.OnSiteListUpdated();
-}
-
SupervisedUserURLFilter::FilteringBehavior
SupervisedUserURLFilter::GetFilteringBehaviorForURL(const GURL& url) const {
supervised_user_error_page::FilteringBehaviorReason reason;
@@ -353,11 +342,6 @@
bool manual_only,
supervised_user_error_page::FilteringBehaviorReason* reason) const {
DCHECK(CalledOnValidThread());
-
- if (!enabled_) {
- *reason = supervised_user_error_page::DEFAULT;
- return ALLOW;
- }
GURL effective_url = GetEmbeddedURL(url);
if (!effective_url.is_valid())
@@ -661,10 +645,8 @@
void SupervisedUserURLFilter::SetContents(std::unique_ptr<Contents> contents) {
DCHECK(CalledOnValidThread());
contents_ = std::move(contents);
- if (enabled_) {
- for (Observer& observer : observers_)
- observer.OnSiteListUpdated();
- }
+ for (Observer& observer : observers_)
+ observer.OnSiteListUpdated();
}
void SupervisedUserURLFilter::CheckCallback(

Powered by Google App Engine
This is Rietveld 408576698