chrome/browser/supervised_user/supervised_user_service.cc - Issue 545173002: Supervised users: Allow the delegate to specify a blacklist to load.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 545173002: Supervised users: Allow the delegate to specify a blacklist to load. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_service.h ('k') | chrome/browser/supervised_user/supervised_user_url_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_service.cc

diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc

index 9816eb09a0cfe6221dfb1b7f86e2e25699e9ff98..ebe71af37a25c588060b58c2c5bb339a22ee248c 100644

--- a/chrome/browser/supervised_user/supervised_user_service.cc

+++ b/chrome/browser/supervised_user/supervised_user_service.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/supervised_user/supervised_user_service.h"

#include "base/command_line.h"

+#include "base/files/file_path.h"

#include "base/memory/ref_counted.h"

#include "base/prefs/pref_service.h"

#include "base/strings/string_number_conversions.h"

@@ -714,6 +715,11 @@ void SupervisedUserService::SetActive(bool active) {

UpdateSiteLists();

UpdateManualHosts();

UpdateManualURLs();

+ if (delegate_) {

+ base::FilePath blacklist_path = delegate_->GetBlacklistPath();

+ if (!blacklist_path.empty())

+ LoadBlacklist(blacklist_path);

+ }

#if !defined(OS_ANDROID)

// TODO(bauerb): Get rid of the platform-specific #ifdef here.