chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc - Issue 819133004: 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/chromeos/login/enrollment/auto_enrollment_controller.cc

Issue 819133004: 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/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc ('k') | chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

index 7259fe1e28a7823c16bdd163f6b397b6110c71c8..ad3dc0c4a561ad54e8a32786ef62f09804922778 100644

--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

@@ -28,7 +28,7 @@ const int kSafeguardTimeoutSeconds = 30;

// Returns the int value of the |switch_name| argument, clamped to the [0, 62]

// interval. Returns 0 if the argument doesn't exist or isn't an int value.

int GetSanitizedArg(const std::string& switch_name) {

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

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

if (!command_line->HasSwitch(switch_name))

return 0;

std::string value = command_line->GetSwitchValueASCII(switch_name);

@@ -72,7 +72,7 @@ const char AutoEnrollmentController::kForcedReEnrollmentOfficialBuild[] =

"official";

AutoEnrollmentController::Mode AutoEnrollmentController::GetMode() {

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

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

std::string command_line_mode = command_line->GetSwitchValueASCII(

switches::kEnterpriseEnableForcedReEnrollment);

@@ -118,7 +118,7 @@ void AutoEnrollmentController::Start() {

// also enables factories to start full guest sessions for testing, see

// http://crbug.com/397354 for more context.

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

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

if (command_line->HasSwitch(chromeos::switches::kDisableGaiaServices) ||

(!command_line->HasSwitch(

chromeos::switches::kEnterpriseEnrollmentInitialModulus) &&