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

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

Issue 14522010: remoting: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « remoting/host/ipc_audio_capturer.cc ('k') | remoting/host/ipc_video_frame_capturer.cc » ('j') | 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 73 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
74 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 74 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
75 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 75 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
76 IPC::Sender* daemon_channel) 76 IPC::Sender* daemon_channel)
77 : audio_task_runner_(audio_task_runner), 77 : audio_task_runner_(audio_task_runner),
78 caller_task_runner_(caller_task_runner), 78 caller_task_runner_(caller_task_runner),
79 capture_task_runner_(capture_task_runner), 79 capture_task_runner_(capture_task_runner),
80 io_task_runner_(io_task_runner), 80 io_task_runner_(io_task_runner),
81 curtain_activated_(false), 81 curtain_activated_(false),
82 daemon_channel_(daemon_channel), 82 daemon_channel_(daemon_channel),
83 connector_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), 83 connector_factory_(this),
84 next_id_(0) { 84 next_id_(0) {
85 } 85 }
86 86
87 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() { 87 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
88 } 88 }
89 89
90 void IpcDesktopEnvironmentFactory::SetActivated(bool activated) { 90 void IpcDesktopEnvironmentFactory::SetActivated(bool activated) {
91 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 91 DCHECK(caller_task_runner_->BelongsToCurrentThread());
92 92
93 curtain_activated_ = activated; 93 curtain_activated_ = activated;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 if (i != active_connections_.end()) { 204 if (i != active_connections_.end()) {
205 DesktopSessionProxy* desktop_session_proxy = i->second; 205 DesktopSessionProxy* desktop_session_proxy = i->second;
206 active_connections_.erase(i); 206 active_connections_.erase(i);
207 207
208 // Disconnect the client session. 208 // Disconnect the client session.
209 desktop_session_proxy->DisconnectSession(); 209 desktop_session_proxy->DisconnectSession();
210 } 210 }
211 } 211 }
212 212
213 } // namespace remoting 213 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/ipc_audio_capturer.cc ('k') | remoting/host/ipc_video_frame_capturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698