summaryrefslogtreecommitdiffstats
path: root/cloud_print/virtual_driver
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-27 08:23:31 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-27 08:23:31 +0000
commitecb10fa1d0b06ba322e0782a1becb67730f69707 (patch)
treee1b944d00a329f9ef0837870a80d09bd01cfa310 /cloud_print/virtual_driver
parent4e5a81b5606ea6bd7be2f631e52e93d0d3b23902 (diff)
downloadchromium_src-ecb10fa1d0b06ba322e0782a1becb67730f69707.zip
chromium_src-ecb10fa1d0b06ba322e0782a1becb67730f69707.tar.gz
chromium_src-ecb10fa1d0b06ba322e0782a1becb67730f69707.tar.bz2
Revert of https://codereview.chromium.org/71013004/
Reason for revert: Causing compile failure in chrome_util.cc on "Google Chrome Win" http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/21803 TBR=cpu@chromium.org,jvoung@chromium.org,thakis@chromium.org,sergeyu@chromium.org,grt@chromium.org,gene@chromium.org,youngki@chromium.org,rvargas@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/90963002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print/virtual_driver')
-rw-r--r--cloud_print/virtual_driver/win/install/setup.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
index 1c87ca2..6e0df24 100644
--- a/cloud_print/virtual_driver/win/install/setup.cc
+++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -97,7 +97,7 @@ void SpoolerServiceCommand(const char* command) {
base::LaunchOptions options;
options.wait = true;
options.start_hidden = true;
- VLOG(0) << command_line.GetCommandLineString();
+ LOG(INFO) << command_line.GetCommandLineString();
base::LaunchProcess(command_line, options, NULL);
}
@@ -140,8 +140,7 @@ HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) {
options.wait = true;
base::win::ScopedHandle regsvr32_handle;
- if (!base::LaunchProcess(command_line.GetCommandLineString(), options,
- &regsvr32_handle)) {
+ if (!base::LaunchProcess(command_line, options, regsvr32_handle.Receive())) {
LOG(ERROR) << "Unable to launch regsvr32.exe.";
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
}
@@ -541,8 +540,8 @@ int WINAPI WinMain(__in HINSTANCE hInstance,
CommandLine::Init(0, NULL);
HRESULT retval = cloud_print::ExecuteCommands();
- VLOG(0) << _com_error(retval).ErrorMessage() << " HRESULT=0x" <<
- std::setbase(16) << retval;
+ LOG(INFO) << _com_error(retval).ErrorMessage() << " HRESULT=0x" <<
+ std::setbase(16) << retval;
// Installer is silent by default as required by Google Update.
if (CommandLine::ForCurrentProcess()->HasSwitch("verbose")) {