Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Side by Side Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/login_utils.h" 5 #include "chrome/browser/chromeos/login/login_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 463
464 if (start_url.is_valid()) 464 if (start_url.is_valid())
465 command_line->AppendArg(start_url.spec()); 465 command_line->AppendArg(start_url.spec());
466 466
467 // Override the value of the homepage that is set in first run mode. 467 // Override the value of the homepage that is set in first run mode.
468 // TODO(altimofeev): extend action of the |kNoFirstRun| to cover this case. 468 // TODO(altimofeev): extend action of the |kNoFirstRun| to cover this case.
469 command_line->AppendSwitchASCII( 469 command_line->AppendSwitchASCII(
470 switches::kHomePage, 470 switches::kHomePage,
471 GURL(chrome::kChromeUINewTabURL).spec()); 471 GURL(chrome::kChromeUINewTabURL).spec());
472 472
473 std::string cmd_line_str = command_line->command_line_string(); 473 std::string cmd_line_str = command_line->GetCommandLineString();
474 // Special workaround for the arguments that should be quoted. 474 // Special workaround for the arguments that should be quoted.
475 // Copying switches won't be needed when Guest mode won't need restart 475 // Copying switches won't be needed when Guest mode won't need restart
476 // http://crosbug.com/6924 476 // http://crosbug.com/6924
477 if (base_command_line.HasSwitch(switches::kRegisterPepperPlugins)) { 477 if (base_command_line.HasSwitch(switches::kRegisterPepperPlugins)) {
478 cmd_line_str += base::StringPrintf( 478 cmd_line_str += base::StringPrintf(
479 kSwitchFormatString, 479 kSwitchFormatString,
480 switches::kRegisterPepperPlugins, 480 switches::kRegisterPepperPlugins,
481 base_command_line.GetSwitchValueNative( 481 base_command_line.GetSwitchValueNative(
482 switches::kRegisterPepperPlugins).c_str()); 482 switches::kRegisterPepperPlugins).c_str());
483 } 483 }
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 // Mark login host for deletion after browser starts. This 614 // Mark login host for deletion after browser starts. This
615 // guarantees that the message loop will be referenced by the 615 // guarantees that the message loop will be referenced by the
616 // browser before it is dereferenced by the login host. 616 // browser before it is dereferenced by the login host.
617 if (login_host) { 617 if (login_host) {
618 login_host->OnSessionStart(); 618 login_host->OnSessionStart();
619 login_host = NULL; 619 login_host = NULL;
620 } 620 }
621 } 621 }
622 622
623 } // namespace chromeos 623 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/browser_main_win.cc ('k') | chrome/browser/chromeos/system/name_value_pairs_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698