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

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

Issue 551393003: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updating files 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 unified diff | Download patch
« no previous file with comments | « remoting/host/ipc_desktop_environment.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
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),
92 capture_task_runner_(capture_task_runner), 92 capture_task_runner_(capture_task_runner),
93 io_task_runner_(io_task_runner), 93 io_task_runner_(io_task_runner),
94 curtain_enabled_(false), 94 curtain_enabled_(false),
95 daemon_channel_(daemon_channel), 95 daemon_channel_(daemon_channel),
96 connector_factory_(this), 96 next_id_(0),
97 next_id_(0) { 97 connector_factory_(this) {
98 } 98 }
99 99
100 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() { 100 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
101 } 101 }
102 102
103 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( 103 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
104 base::WeakPtr<ClientSessionControl> client_session_control) { 104 base::WeakPtr<ClientSessionControl> client_session_control) {
105 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 105 DCHECK(caller_task_runner_->BelongsToCurrentThread());
106 106
107 return scoped_ptr<DesktopEnvironment>( 107 return scoped_ptr<DesktopEnvironment>(
(...skipping 108 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
« no previous file with comments | « remoting/host/ipc_desktop_environment.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698