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

Side by Side Diff: remoting/host/client_session.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/chromoting_host.cc ('k') | remoting/host/daemon_process.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/client_session.h" 5 #include "remoting/host/client_session.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/message_loop_proxy.h" 9 #include "base/message_loop_proxy.h"
10 #include "media/video/capture/screen/screen_capturer.h" 10 #include "media/video/capture/screen/screen_capturer.h"
(...skipping 29 matching lines...) Expand all
40 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 40 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
41 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner, 41 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
42 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, 42 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
43 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 43 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
44 scoped_ptr<protocol::ConnectionToClient> connection, 44 scoped_ptr<protocol::ConnectionToClient> connection,
45 DesktopEnvironmentFactory* desktop_environment_factory, 45 DesktopEnvironmentFactory* desktop_environment_factory,
46 const base::TimeDelta& max_duration) 46 const base::TimeDelta& max_duration)
47 : event_handler_(event_handler), 47 : event_handler_(event_handler),
48 connection_(connection.Pass()), 48 connection_(connection.Pass()),
49 client_jid_(connection_->session()->jid()), 49 client_jid_(connection_->session()->jid()),
50 control_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), 50 control_factory_(this),
51 desktop_environment_factory_(desktop_environment_factory), 51 desktop_environment_factory_(desktop_environment_factory),
52 input_tracker_(&host_input_filter_), 52 input_tracker_(&host_input_filter_),
53 remote_input_filter_(&input_tracker_), 53 remote_input_filter_(&input_tracker_),
54 mouse_clamping_filter_(&remote_input_filter_), 54 mouse_clamping_filter_(&remote_input_filter_),
55 disable_input_filter_(mouse_clamping_filter_.input_filter()), 55 disable_input_filter_(mouse_clamping_filter_.input_filter()),
56 disable_clipboard_filter_(clipboard_echo_filter_.host_filter()), 56 disable_clipboard_filter_(clipboard_echo_filter_.host_filter()),
57 auth_input_filter_(&disable_input_filter_), 57 auth_input_filter_(&disable_input_filter_),
58 auth_clipboard_filter_(&disable_clipboard_filter_), 58 auth_clipboard_filter_(&disable_clipboard_filter_),
59 client_clipboard_factory_(clipboard_echo_filter_.client_filter()), 59 client_clipboard_factory_(clipboard_echo_filter_.client_filter()),
60 max_duration_(max_duration), 60 max_duration_(max_duration),
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex()); 402 return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex());
403 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { 403 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
404 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); 404 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus());
405 } 405 }
406 406
407 NOTIMPLEMENTED(); 407 NOTIMPLEMENTED();
408 return scoped_ptr<AudioEncoder>(NULL); 408 return scoped_ptr<AudioEncoder>(NULL);
409 } 409 }
410 410
411 } // namespace remoting 411 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/chromoting_host.cc ('k') | remoting/host/daemon_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698