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

Side by Side Diff: remoting/host/setup/daemon_installer_win.cc

Issue 92173002: Merge 237541 "Revert of https://codereview.chromium.org/71013004/" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1721/src/
Patch Set: Created 7 years 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
« no previous file with comments | « remoting/host/desktop_session_proxy.cc ('k') | remoting/host/win/chromoting_module.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 string16 command_line = WideToUTF16( 296 string16 command_line = 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 if (!base::LaunchProcess(command_line, options, process_.Receive())) {
304 result = GetLastError(); 304 result = GetLastError();
305 Done(HRESULT_FROM_WIN32(result)); 305 Done(HRESULT_FROM_WIN32(result));
306 return; 306 return;
307 } 307 }
308 308
309 if (!process_watcher_.StartWatching(process_.Get(), this)) { 309 if (!process_watcher_.StartWatching(process_.Get(), this)) {
310 result = GetLastError(); 310 result = GetLastError();
311 Done(HRESULT_FROM_WIN32(result)); 311 Done(HRESULT_FROM_WIN32(result));
312 return; 312 return;
313 } 313 }
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 HWND parent = GetAncestor(window, GA_PARENT); 401 HWND parent = GetAncestor(window, GA_PARENT);
402 if (parent == NULL) { 402 if (parent == NULL) {
403 return window; 403 return window;
404 } 404 }
405 405
406 window = parent; 406 window = parent;
407 } 407 }
408 } 408 }
409 409
410 } // namespace remoting 410 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/desktop_session_proxy.cc ('k') | remoting/host/win/chromoting_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698