diff options
author | pgal.u-szeged <pgal.u-szeged@partner.samsung.com> | 2014-11-18 18:06:03 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 02:06:18 +0000 |
commit | 588a3ead6ef36c3ccb9dd51dd028c251a4fb511b (patch) | |
tree | 07deba5a66eff63e8482ae1b1e87688c209014ff /cloud_print/virtual_driver | |
parent | 539d8860344b808a289bf9361da51621a57c03a4 (diff) | |
download | chromium_src-588a3ead6ef36c3ccb9dd51dd028c251a4fb511b.zip chromium_src-588a3ead6ef36c3ccb9dd51dd028c251a4fb511b.tar.gz chromium_src-588a3ead6ef36c3ccb9dd51dd028c251a4fb511b.tar.bz2 |
Prefix CommandLine usage with base namespace (Part 7: cloud_print/)
Prefix all CommandLine usage in the cloud_print/ directory with
the base:: namespace.
R=vitalybuka@chromium.org
BUG=422426
Review URL: https://codereview.chromium.org/735053002
Cr-Commit-Position: refs/heads/master@{#304744}
Diffstat (limited to 'cloud_print/virtual_driver')
-rw-r--r-- | cloud_print/virtual_driver/win/install/setup.cc | 11 | ||||
-rw-r--r-- | cloud_print/virtual_driver/win/port_monitor/port_monitor.cc | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index 0435eb3..6597758 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -88,7 +88,7 @@ void SpoolerServiceCommand(const char* command) { base::FilePath net_path = GetNativeSystemPath(L"net"); if (net_path.empty()) return; - CommandLine command_line(net_path); + base::CommandLine command_line(net_path); command_line.AppendArg(command); command_line.AppendArg("spooler"); command_line.AppendArg("/y"); @@ -126,7 +126,7 @@ HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) { return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); } - CommandLine command_line(regsvr32_path); + base::CommandLine command_line(regsvr32_path); command_line.AppendArg("/s"); if (!install) { command_line.AppendArg("/u"); @@ -503,7 +503,8 @@ HRESULT DoInstall(const base::FilePath& install_path) { } HRESULT ExecuteCommands() { - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); base::FilePath exe_path; if (FAILED(PathService::Get(base::DIR_EXE, &exe_path)) || @@ -537,7 +538,7 @@ int WINAPI WinMain(__in HINSTANCE hInstance, using namespace cloud_print; base::AtExitManager at_exit_manager; - CommandLine::Init(0, NULL); + base::CommandLine::Init(0, NULL); HRESULT retval = ExecuteCommands(); @@ -552,7 +553,7 @@ int WINAPI WinMain(__in HINSTANCE hInstance, << " HRESULT=0x" << std::setbase(16) << retval; // Installer is silent by default as required by Google Update. - if (CommandLine::ForCurrentProcess()->HasSwitch("verbose")) { + if (base::CommandLine::ForCurrentProcess()->HasSwitch("verbose")) { DisplayWindowsMessage(NULL, retval, LoadLocalString(IDS_DRIVER_NAME)); } return retval; diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc index 28c4a3b..0878bac 100644 --- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc @@ -218,7 +218,7 @@ bool LaunchPrintDialog(const base::FilePath& xps_path, return false; } - CommandLine command_line(chrome_path); + base::CommandLine command_line(chrome_path); base::FilePath chrome_profile = GetChromeProfilePath(); if (!chrome_profile.empty()) @@ -250,7 +250,7 @@ void LaunchChromeDownloadPage() { base::FilePath ie_path; PathService::Get(base::DIR_PROGRAM_FILESX86, &ie_path); ie_path = ie_path.Append(kIePath); - CommandLine command_line(ie_path); + base::CommandLine command_line(ie_path); command_line.AppendArg(kChromeInstallUrl); base::LaunchOptions options; |