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

Side by Side Diff: remoting/host/ipc_desktop_environment.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/ipc_desktop_environment.h" 5 #include "remoting/host/ipc_desktop_environment.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 std::string IpcDesktopEnvironment::GetCapabilities() const { 71 std::string IpcDesktopEnvironment::GetCapabilities() const {
72 return desktop_session_proxy_->GetCapabilities(); 72 return desktop_session_proxy_->GetCapabilities();
73 } 73 }
74 74
75 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) { 75 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
76 return desktop_session_proxy_->SetCapabilities(capabilities); 76 return desktop_session_proxy_->SetCapabilities(capabilities);
77 } 77 }
78 78
79 scoped_ptr<GnubbyAuthHandler> IpcDesktopEnvironment::CreateGnubbyAuthHandler( 79 scoped_ptr<GnubbyAuthHandler> IpcDesktopEnvironment::CreateGnubbyAuthHandler(
80 protocol::ClientStub* client_stub) { 80 protocol::ClientStub* client_stub) {
81 return scoped_ptr<GnubbyAuthHandler>(); 81 return nullptr;
82 } 82 }
83 83
84 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( 84 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
85 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 85 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
86 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 86 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
87 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 87 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
88 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 88 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
89 IPC::Sender* daemon_channel) 89 IPC::Sender* daemon_channel)
90 : audio_task_runner_(audio_task_runner), 90 : audio_task_runner_(audio_task_runner),
91 caller_task_runner_(caller_task_runner), 91 caller_task_runner_(caller_task_runner),
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 if (i != active_connections_.end()) { 216 if (i != active_connections_.end()) {
217 DesktopSessionProxy* desktop_session_proxy = i->second; 217 DesktopSessionProxy* desktop_session_proxy = i->second;
218 active_connections_.erase(i); 218 active_connections_.erase(i);
219 219
220 // Disconnect the client session. 220 // Disconnect the client session.
221 desktop_session_proxy->DisconnectSession(); 221 desktop_session_proxy->DisconnectSession();
222 } 222 }
223 } 223 }
224 224
225 } // namespace remoting 225 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698