chrome/browser/chromeos/login/wizard_controller.cc - Issue 7352006: Rename CommandLine::GetArgs(), update callers.

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/wizard_controller.cc

Issue 7352006: Rename CommandLine::GetArgs(), update callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rename CommandLine::GetArgs(), update callers. Created 9 years, 5 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:

Index: chrome/browser/chromeos/login/wizard_controller.cc

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

index 2333556bfe2d186139d484f068564d29f76550a4..96f406c89279443387cf6b079d33c81af4d79f88 100644

--- a/chrome/browser/chromeos/login/wizard_controller.cc

+++ b/chrome/browser/chromeos/login/wizard_controller.cc

@@ -202,16 +202,18 @@ chromeos::RegistrationScreen* WizardController::GetRegistrationScreen() {

chromeos::HTMLPageScreen* WizardController::GetHTMLPageScreen() {

if (!html_page_screen_.get()) {

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

+ const CommandLine* cmd_line = CommandLine::ForCurrentProcess();

+ const CommandLine::StringVector& args = cmd_line->GetArgs();

std::string url;

// It's strange but args may contains empty strings.

- for (size_t i = 0; i < command_line->args().size(); i++) {

- if (!command_line->args()[i].empty()) {

+ for (size_t i = 0; i < args.size(); i++) {

+ if (!args[i].empty()) {

DCHECK(url.empty()) << "More than one URL in command line";

- url = command_line->args()[i];

+ url = args[i];

}

- DCHECK(!url.empty()) << "No URL in commane line";

+ DCHECK(!url.empty()) << "No URL in command line";

html_page_screen_.reset(

new chromeos::HTMLPageScreen(

oobe_display_->GetHTMLPageScreenActor(), url));

« no previous file with comments | « base/command_line_unittest.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »