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

Side by Side Diff: remoting/client/chromoting_client.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/base/socket_reader.cc ('k') | remoting/client/plugin/chromoting_instance.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/client/chromoting_client.h" 5 #include "remoting/client/chromoting_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "remoting/base/capabilities.h" 8 #include "remoting/base/capabilities.h"
9 #include "remoting/client/audio_decode_scheduler.h" 9 #include "remoting/client/audio_decode_scheduler.h"
10 #include "remoting/client/audio_player.h" 10 #include "remoting/client/audio_player.h"
(...skipping 18 matching lines...) Expand all
29 ClientContext* client_context, 29 ClientContext* client_context,
30 protocol::ConnectionToHost* connection, 30 protocol::ConnectionToHost* connection,
31 ClientUserInterface* user_interface, 31 ClientUserInterface* user_interface,
32 scoped_refptr<FrameConsumerProxy> frame_consumer, 32 scoped_refptr<FrameConsumerProxy> frame_consumer,
33 scoped_ptr<AudioPlayer> audio_player) 33 scoped_ptr<AudioPlayer> audio_player)
34 : config_(config), 34 : config_(config),
35 task_runner_(client_context->main_task_runner()), 35 task_runner_(client_context->main_task_runner()),
36 connection_(connection), 36 connection_(connection),
37 user_interface_(user_interface), 37 user_interface_(user_interface),
38 host_capabilities_received_(false), 38 host_capabilities_received_(false),
39 weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { 39 weak_factory_(this) {
40 rectangle_decoder_ = 40 rectangle_decoder_ =
41 new RectangleUpdateDecoder(client_context->main_task_runner(), 41 new RectangleUpdateDecoder(client_context->main_task_runner(),
42 client_context->decode_task_runner(), 42 client_context->decode_task_runner(),
43 frame_consumer); 43 frame_consumer);
44 audio_decode_scheduler_.reset(new AudioDecodeScheduler( 44 audio_decode_scheduler_.reset(new AudioDecodeScheduler(
45 client_context->main_task_runner(), 45 client_context->main_task_runner(),
46 client_context->audio_decode_task_runner(), 46 client_context->audio_decode_task_runner(),
47 audio_player.Pass())); 47 audio_player.Pass()));
48 } 48 }
49 49
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 if (connection_->config().SupportsCapabilities()) { 171 if (connection_->config().SupportsCapabilities()) {
172 VLOG(1) << "Client capabilities: " << config_.capabilities; 172 VLOG(1) << "Client capabilities: " << config_.capabilities;
173 173
174 protocol::Capabilities capabilities; 174 protocol::Capabilities capabilities;
175 capabilities.set_capabilities(config_.capabilities); 175 capabilities.set_capabilities(config_.capabilities);
176 connection_->host_stub()->SetCapabilities(capabilities); 176 connection_->host_stub()->SetCapabilities(capabilities);
177 } 177 }
178 } 178 }
179 179
180 } // namespace remoting 180 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/base/socket_reader.cc ('k') | remoting/client/plugin/chromoting_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698