summaryrefslogtreecommitdiffstats
path: root/remoting/host/desktop_session_proxy.cc
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2015-12-08 18:32:14 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-09 02:33:48 +0000
commitd3719e0d139b0d6adbde4bdbbe1c459a6f0eba01 (patch)
treec5a2e8f8f159b2cd4312d3adfc14c2010a0fa857 /remoting/host/desktop_session_proxy.cc
parentad16630e61f671e11389e3fb90cf6c86bf3cba18 (diff)
downloadchromium_src-d3719e0d139b0d6adbde4bdbbe1c459a6f0eba01.zip
chromium_src-d3719e0d139b0d6adbde4bdbbe1c459a6f0eba01.tar.gz
chromium_src-d3719e0d139b0d6adbde4bdbbe1c459a6f0eba01.tar.bz2
Remove dependency on webrtc::SharedMemory::handle()
webrtc::SharedMemory::handle() is never useful, so it will need to be removed. This changed removes dependency on that field so it can be removed later. Review URL: https://codereview.chromium.org/1509723003 Cr-Commit-Position: refs/heads/master@{#363934}
Diffstat (limited to 'remoting/host/desktop_session_proxy.cc')
-rw-r--r--remoting/host/desktop_session_proxy.cc14
1 files changed, 2 insertions, 12 deletions
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc
index 4536500..6166d20 100644
--- a/remoting/host/desktop_session_proxy.cc
+++ b/remoting/host/desktop_session_proxy.cc
@@ -67,14 +67,6 @@ class DesktopSessionProxy::IpcSharedBufferCore
int id() { return id_; }
size_t size() { return size_; }
void* memory() { return shared_memory_.memory(); }
- webrtc::SharedMemory::Handle handle() {
-#if defined(OS_WIN)
- return shared_memory_.handle().GetHandle();
-#else
- return base::SharedMemory::GetFdFromSharedMemoryHandle(
- shared_memory_.handle());
-#endif
- }
private:
virtual ~IpcSharedBufferCore() {}
@@ -90,10 +82,8 @@ class DesktopSessionProxy::IpcSharedBufferCore
class DesktopSessionProxy::IpcSharedBuffer : public webrtc::SharedMemory {
public:
IpcSharedBuffer(scoped_refptr<IpcSharedBufferCore> core)
- : SharedMemory(core->memory(), core->size(),
- core->handle(), core->id()),
- core_(core) {
- }
+ : SharedMemory(core->memory(), core->size(), 0, core->id()),
+ core_(core) {}
private:
scoped_refptr<IpcSharedBufferCore> core_;