OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "remoting/host/setup/daemon_installer_win.h" | 5 #include "remoting/host/setup/daemon_installer_win.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 ~DaemonCommandLineInstallerWin(); | 95 ~DaemonCommandLineInstallerWin(); |
96 | 96 |
97 // DaemonInstallerWin implementation. | 97 // DaemonInstallerWin implementation. |
98 virtual void Install() override; | 98 virtual void Install() override; |
99 | 99 |
100 // base::win::ObjectWatcher::Delegate implementation. | 100 // base::win::ObjectWatcher::Delegate implementation. |
101 virtual void OnObjectSignaled(HANDLE object) override; | 101 virtual void OnObjectSignaled(HANDLE object) override; |
102 | 102 |
103 private: | 103 private: |
104 // Handle of the launched process. | 104 // Handle of the launched process. |
105 base::win::ScopedHandle process_; | 105 base::Process process_; |
106 | 106 |
107 // Used to determine when the launched process terminates. | 107 // Used to determine when the launched process terminates. |
108 base::win::ObjectWatcher process_watcher_; | 108 base::win::ObjectWatcher process_watcher_; |
109 }; | 109 }; |
110 | 110 |
111 DaemonComInstallerWin::DaemonComInstallerWin( | 111 DaemonComInstallerWin::DaemonComInstallerWin( |
112 const ScopedComPtr<IDispatch>& update3, | 112 const ScopedComPtr<IDispatch>& update3, |
113 const CompletionCallback& done) | 113 const CompletionCallback& done) |
114 : DaemonInstallerWin(done), | 114 : DaemonInstallerWin(done), |
115 update3_(update3), | 115 update3_(update3), |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 } | 293 } |
294 | 294 |
295 // Launch the updater process and wait for its termination. | 295 // Launch the updater process and wait for its termination. |
296 base::string16 command_line = base::WideToUTF16( | 296 base::string16 command_line = base::WideToUTF16( |
297 base::StringPrintf(kGoogleUpdateCommandLineFormat, | 297 base::StringPrintf(kGoogleUpdateCommandLineFormat, |
298 google_update.c_str(), | 298 google_update.c_str(), |
299 kHostOmahaAppid, | 299 kHostOmahaAppid, |
300 kOmahaLanguage)); | 300 kOmahaLanguage)); |
301 | 301 |
302 base::LaunchOptions options; | 302 base::LaunchOptions options; |
303 if (!base::LaunchProcess(command_line, options, &process_)) { | 303 process_ = base::LaunchProcess(command_line, options); |
| 304 if (!process_.IsValid()) { |
304 result = GetLastError(); | 305 result = GetLastError(); |
305 Done(HRESULT_FROM_WIN32(result)); | 306 Done(HRESULT_FROM_WIN32(result)); |
306 return; | 307 return; |
307 } | 308 } |
308 | 309 |
309 if (!process_watcher_.StartWatching(process_.Get(), this)) { | 310 if (!process_watcher_.StartWatching(process_.Handle(), this)) { |
310 result = GetLastError(); | 311 result = GetLastError(); |
311 Done(HRESULT_FROM_WIN32(result)); | 312 Done(HRESULT_FROM_WIN32(result)); |
312 return; | 313 return; |
313 } | 314 } |
314 } | 315 } |
315 | 316 |
316 void DaemonCommandLineInstallerWin::OnObjectSignaled(HANDLE object) { | 317 void DaemonCommandLineInstallerWin::OnObjectSignaled(HANDLE object) { |
317 // Check if the updater process returned success. | 318 // Check if the updater process returned success. |
318 DWORD exit_code; | 319 DWORD exit_code; |
319 if (GetExitCodeProcess(process_.Get(), &exit_code) && exit_code == 0) { | 320 if (GetExitCodeProcess(process_.Handle(), &exit_code) && exit_code == 0) { |
320 Done(S_OK); | 321 Done(S_OK); |
321 } else { | 322 } else { |
322 Done(E_FAIL); | 323 Done(E_FAIL); |
323 } | 324 } |
324 } | 325 } |
325 | 326 |
326 DaemonInstallerWin::DaemonInstallerWin(const CompletionCallback& done) | 327 DaemonInstallerWin::DaemonInstallerWin(const CompletionCallback& done) |
327 : done_(done) { | 328 : done_(done) { |
328 } | 329 } |
329 | 330 |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 HWND parent = GetAncestor(window, GA_PARENT); | 403 HWND parent = GetAncestor(window, GA_PARENT); |
403 if (parent == NULL) { | 404 if (parent == NULL) { |
404 return window; | 405 return window; |
405 } | 406 } |
406 | 407 |
407 window = parent; | 408 window = parent; |
408 } | 409 } |
409 } | 410 } |
410 | 411 |
411 } // namespace remoting | 412 } // namespace remoting |
OLD | NEW |