diff options
author | avi <avi@chromium.org> | 2014-12-22 14:50:17 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 22:51:05 +0000 |
commit | 3ef9ec9e43e5e5b7aca6ea935407a469d7b528cf (patch) | |
tree | 96d5759f382e635270a05013501abadf777ca0cf /chrome/app/chrome_exe_main_win.cc | |
parent | 1772c1ae7194b0efdbd3c65d1654902daabb1c51 (diff) | |
download | chromium_src-3ef9ec9e43e5e5b7aca6ea935407a469d7b528cf.zip chromium_src-3ef9ec9e43e5e5b7aca6ea935407a469d7b528cf.tar.gz chromium_src-3ef9ec9e43e5e5b7aca6ea935407a469d7b528cf.tar.bz2 |
Make callers of CommandLine use it via the base:: namespace.
Covers chrome/app* and chrome/browser/* through e.
BUG=422426
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/819133004
Cr-Commit-Position: refs/heads/master@{#309476}
Diffstat (limited to 'chrome/app/chrome_exe_main_win.cc')
-rw-r--r-- | chrome/app/chrome_exe_main_win.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc index b09a76b..1ef4082 100644 --- a/chrome/app/chrome_exe_main_win.cc +++ b/chrome/app/chrome_exe_main_win.cc @@ -43,11 +43,11 @@ bool IsFastStartSwitch(const std::string& command_line_switch) { return false; } -bool ContainsNonFastStartFlag(const CommandLine& command_line) { - const CommandLine::SwitchMap& switches = command_line.GetSwitches(); +bool ContainsNonFastStartFlag(const base::CommandLine& command_line) { + const base::CommandLine::SwitchMap& switches = command_line.GetSwitches(); if (switches.size() > arraysize(kFastStartSwitches)) return true; - for (CommandLine::SwitchMap::const_iterator it = switches.begin(); + for (base::CommandLine::SwitchMap::const_iterator it = switches.begin(); it != switches.end(); ++it) { if (!IsFastStartSwitch(it->first)) return true; @@ -55,7 +55,7 @@ bool ContainsNonFastStartFlag(const CommandLine& command_line) { return false; } -bool AttemptFastNotify(const CommandLine& command_line) { +bool AttemptFastNotify(const base::CommandLine& command_line) { if (ContainsNonFastStartFlag(command_line)) return false; @@ -138,7 +138,7 @@ int main() { SignalChromeElf(); // Initialize the commandline singleton from the environment. - CommandLine::Init(0, NULL); + base::CommandLine::Init(0, NULL); // The exit manager is in charge of calling the dtors of singletons. base::AtExitManager exit_manager; @@ -148,7 +148,7 @@ int main() { if (base::win::GetVersion() >= base::win::VERSION_WIN7) EnableHighDPISupport(); - if (AttemptFastNotify(*CommandLine::ForCurrentProcess())) + if (AttemptFastNotify(*base::CommandLine::ForCurrentProcess())) return 0; // Load and launch the chrome dll. *Everything* happens inside. |