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

Unified Diff: remoting/host/daemon_process_win.cc

Issue 602763003: Remove implicit HANDLE conversions from remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/daemon_process_win.cc
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
index a67a8dba881db02e1fcee549009a0109655f9c5c..b4cb9d19ec0a24693d1ae99a8e11de02ffdf01ec 100644
--- a/remoting/host/daemon_process_win.cc
+++ b/remoting/host/daemon_process_win.cc
@@ -164,7 +164,7 @@ bool DaemonProcessWin::OnDesktopSessionAgentAttached(
base::ProcessHandle desktop_process_for_transit;
if (!DuplicateHandle(GetCurrentProcess(),
desktop_process,
- network_process_,
+ network_process_.Get(),
&desktop_process_for_transit,
0,
FALSE,
@@ -247,7 +247,7 @@ void DaemonProcessWin::DisableAutoStart() {
DWORD desired_access = SERVICE_CHANGE_CONFIG | SERVICE_QUERY_STATUS;
ScopedScHandle service(
- OpenService(scmanager, kWindowsServiceName, desired_access));
+ OpenService(scmanager.Get(), kWindowsServiceName, desired_access));
if (!service.IsValid()) {
PLOG(INFO) << "Failed to open to the '" << kWindowsServiceName
<< "' service";
@@ -256,7 +256,7 @@ void DaemonProcessWin::DisableAutoStart() {
// Change the service start type to 'manual'. All |NULL| parameters below mean
// that there is no change to the corresponding service parameter.
- if (!ChangeServiceConfig(service,
+ if (!ChangeServiceConfig(service.Get(),
SERVICE_NO_CHANGE,
SERVICE_DEMAND_START,
SERVICE_NO_CHANGE,
@@ -280,9 +280,9 @@ bool DaemonProcessWin::InitializePairingRegistry() {
// Duplicate handles to the network process.
IPC::PlatformFileForTransit privileged_key = GetRegistryKeyForTransit(
- network_process_, pairing_registry_privileged_key_);
+ network_process_.Get(), pairing_registry_privileged_key_);
IPC::PlatformFileForTransit unprivileged_key = GetRegistryKeyForTransit(
- network_process_, pairing_registry_unprivileged_key_);
+ network_process_.Get(), pairing_registry_unprivileged_key_);
if (!(privileged_key && unprivileged_key))
return false;
« no previous file with comments | « no previous file | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698