summaryrefslogtreecommitdiffstats
path: root/remoting/host/desktop_session_proxy.cc
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 /remoting/host/desktop_session_proxy.cc
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 'remoting/host/desktop_session_proxy.cc')
-rw-r--r--remoting/host/desktop_session_proxy.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc
index 058a2f4..9e52f8d 100644
--- a/remoting/host/desktop_session_proxy.cc
+++ b/remoting/host/desktop_session_proxy.cc
@@ -230,9 +230,9 @@ bool DesktopSessionProxy::AttachToDesktop(
#if defined(OS_WIN)
// On Windows: |desktop_process| is a valid handle, but |desktop_pipe| needs
// to be duplicated from the desktop process.
- HANDLE temp_handle;
+ base::win::ScopedHandle pipe;
if (!DuplicateHandle(desktop_process_, desktop_pipe, GetCurrentProcess(),
- &temp_handle, 0, FALSE, DUPLICATE_SAME_ACCESS)) {
+ pipe.Receive(), 0, FALSE, DUPLICATE_SAME_ACCESS)) {
LOG_GETLASTERROR(ERROR) << "Failed to duplicate the desktop-to-network"
" pipe handle";
@@ -240,7 +240,6 @@ bool DesktopSessionProxy::AttachToDesktop(
base::CloseProcessHandle(desktop_process);
return false;
}
- base::win::ScopedHandle pipe(temp_handle);
IPC::ChannelHandle desktop_channel_handle(pipe);