chrome/browser/supervised_user/supervised_user_service.cc - Issue 816403003: Make callers of CommandLine use it via the base:: namespace.

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 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 6 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

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc ('k') | chrome/browser/supervised_user/supervised_user_service_browsertest.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 c9be21a45512315657eb1e54b99cd472f555f3d7..1a8c101d2f65e5ea263b637fad476d62718f797d 100644

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

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

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

SupervisedUserPrefMappingServiceFactory::GetForBrowserContext(profile_)

->Init();

- CommandLine* command_line = CommandLine::ForCurrentProcess();

+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();

if (command_line->HasSwitch(switches::kSupervisedUserSyncToken)) {

InitSync(

command_line->GetSwitchValueASCII(

@@ -833,17 +833,15 @@ void SupervisedUserService::SetActive(bool active) {

UpdateSiteLists();

UpdateManualHosts();

UpdateManualURLs();

- bool use_blacklist =

- CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableSupervisedUserBlacklist);

+ bool use_blacklist = base::CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kEnableSupervisedUserBlacklist);

if (delegate_ && use_blacklist) {

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

if (!blacklist_path.empty())

LoadBlacklist(blacklist_path, delegate_->GetBlacklistURL());

}

- bool use_safesites =

- CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableSupervisedUserSafeSites);

+ bool use_safesites = base::CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kEnableSupervisedUserSafeSites);

if (delegate_ && use_safesites) {

const std::string& cx = delegate_->GetSafeSitesCx();

if (!cx.empty()) {