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

Unified Diff: chrome/browser/supervised_user/supervised_user_service.h

Issue 537993002: Supervised users: Prototype of static client-side host blacklist. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: experimental Created 6 years, 3 months 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_service.h
diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
index 7bbdfedefab7adc3b972c779ed10fd6ed1ed7fbe..f373947d19d8cf44efb2a92f38514aa5e72d6c28 100644
--- a/chrome/browser/supervised_user/supervised_user_service.h
+++ b/chrome/browser/supervised_user/supervised_user_service.h
@@ -14,6 +14,7 @@
#include "base/prefs/pref_change_registrar.h"
#include "base/scoped_observer.h"
#include "base/strings/string16.h"
+#include "chrome/browser/supervised_user/experimental/supervised_user_blacklist.h"
#include "chrome/browser/supervised_user/supervised_user_url_filter.h"
#include "chrome/browser/supervised_user/supervised_users.h"
#include "chrome/browser/sync/profile_sync_service_observer.h"
@@ -202,10 +203,13 @@ class SupervisedUserService : public KeyedService,
void SetDefaultFilteringBehavior(
SupervisedUserURLFilter::FilteringBehavior behavior);
void LoadWhitelists(ScopedVector<SupervisedUserSiteList> site_lists);
+ void LoadBlacklist(const base::FilePath& path);
void SetManualHosts(scoped_ptr<std::map<std::string, bool> > host_map);
void SetManualURLs(scoped_ptr<std::map<GURL, bool> > url_map);
private:
+ void OnBlacklistLoaded();
+
// SupervisedUserURLFilter is refcounted because the IO thread filter is
// used both by ProfileImplIOData and OffTheRecordProfileIOData (to filter
// network requests), so they both keep a reference to it.
@@ -215,6 +219,8 @@ class SupervisedUserService : public KeyedService,
scoped_refptr<SupervisedUserURLFilter> ui_url_filter_;
scoped_refptr<SupervisedUserURLFilter> io_url_filter_;
+ SupervisedUserBlacklist blacklist_;
+
DISALLOW_COPY_AND_ASSIGN(URLFilterContext);
};
@@ -261,6 +267,10 @@ class SupervisedUserService : public KeyedService,
void UpdateSiteLists();
+ // Asynchronously loads a static blacklist from a binary file at |path| and
+ // applies it to the URL filters.
+ void LoadBlacklist(const base::FilePath& path);
+
// Updates the manual overrides for hosts in the URL filters when the
// corresponding preference is changed.
void UpdateManualHosts();

Powered by Google App Engine
This is Rietveld 408576698