chrome/browser/supervised_user/supervised_user_service.cc - Issue 545193003: Supervised users: Add a cmdline flag and about:flags entry to enable the host blacklist

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 545193003: Supervised users: Add a cmdline flag and about:flags entry to enable the host blacklist (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update histograms 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.cc

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

index ebe71af37a25c588060b58c2c5bb339a22ee248c..0017d8cba68084a984b0b5885dc88393f60bb503 100644

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

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

@@ -715,7 +715,10 @@ void SupervisedUserService::SetActive(bool active) {

UpdateSiteLists();

UpdateManualHosts();

UpdateManualURLs();

- if (delegate_) {

+ bool use_blacklist =

+ CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kEnableSupervisedUserBlacklist);

+ if (delegate_ && use_blacklist) {

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

if (!blacklist_path.empty())

LoadBlacklist(blacklist_path);

« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »