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

Side by Side Diff: remoting/host/desktop_session_agent.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
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/desktop_session_agent.h" 5 #include "remoting/host/desktop_session_agent.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/shared_memory.h" 9 #include "base/memory/shared_memory.h"
10 #include "ipc/ipc_channel_proxy.h" 10 #include "ipc/ipc_channel_proxy.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 // webrtc::SharedMemory implementation that notifies creating 69 // webrtc::SharedMemory implementation that notifies creating
70 // DesktopSessionAgent when it's deleted. 70 // DesktopSessionAgent when it's deleted.
71 class DesktopSessionAgent::SharedBuffer : public webrtc::SharedMemory { 71 class DesktopSessionAgent::SharedBuffer : public webrtc::SharedMemory {
72 public: 72 public:
73 static scoped_ptr<SharedBuffer> Create(DesktopSessionAgent* agent, 73 static scoped_ptr<SharedBuffer> Create(DesktopSessionAgent* agent,
74 size_t size, 74 size_t size,
75 int id) { 75 int id) {
76 scoped_ptr<base::SharedMemory> memory(new base::SharedMemory()); 76 scoped_ptr<base::SharedMemory> memory(new base::SharedMemory());
77 if (!memory->CreateAndMapAnonymous(size)) 77 if (!memory->CreateAndMapAnonymous(size))
78 return scoped_ptr<SharedBuffer>(); 78 return nullptr;
79 return scoped_ptr<SharedBuffer>( 79 return scoped_ptr<SharedBuffer>(
80 new SharedBuffer(agent, memory.Pass(), size, id)); 80 new SharedBuffer(agent, memory.Pass(), size, id));
81 } 81 }
82 82
83 virtual ~SharedBuffer() { 83 virtual ~SharedBuffer() {
84 agent_->OnSharedBufferDeleted(id()); 84 agent_->OnSharedBufferDeleted(id());
85 } 85 }
86 86
87 private: 87 private:
88 SharedBuffer(DesktopSessionAgent* agent, 88 SharedBuffer(DesktopSessionAgent* agent,
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 void DesktopSessionAgent::OnSharedBufferDeleted(int id) { 583 void DesktopSessionAgent::OnSharedBufferDeleted(int id) {
584 DCHECK(video_capture_task_runner_->BelongsToCurrentThread()); 584 DCHECK(video_capture_task_runner_->BelongsToCurrentThread());
585 DCHECK(id != 0); 585 DCHECK(id != 0);
586 586
587 shared_buffers_--; 587 shared_buffers_--;
588 DCHECK_GE(shared_buffers_, 0); 588 DCHECK_GE(shared_buffers_, 0);
589 SendToNetwork(new ChromotingDesktopNetworkMsg_ReleaseSharedBuffer(id)); 589 SendToNetwork(new ChromotingDesktopNetworkMsg_ReleaseSharedBuffer(id));
590 } 590 }
591 591
592 } // namespace remoting 592 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698