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

Side by Side Diff: remoting/client/plugin/chromoting_instance.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/client/chromoting_client.cc ('k') | remoting/client/plugin/pepper_network_manager.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/plugin/chromoting_instance.h" 5 #include "remoting/client/plugin/chromoting_instance.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 #if defined(OS_MACOSX) 175 #if defined(OS_MACOSX)
176 // On Mac we need an extra filter to inject missing keyup events. 176 // On Mac we need an extra filter to inject missing keyup events.
177 // See remoting/client/plugin/mac_key_event_processor.h for more details. 177 // See remoting/client/plugin/mac_key_event_processor.h for more details.
178 mac_key_event_processor_(&input_tracker_), 178 mac_key_event_processor_(&input_tracker_),
179 key_mapper_(&mac_key_event_processor_), 179 key_mapper_(&mac_key_event_processor_),
180 #else 180 #else
181 key_mapper_(&input_tracker_), 181 key_mapper_(&input_tracker_),
182 #endif 182 #endif
183 input_handler_(&key_mapper_), 183 input_handler_(&key_mapper_),
184 use_async_pin_dialog_(false), 184 use_async_pin_dialog_(false),
185 weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { 185 weak_factory_(this) {
186 RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL); 186 RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL);
187 RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD); 187 RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD);
188 188
189 // Resister this instance to handle debug log messsages. 189 // Resister this instance to handle debug log messsages.
190 RegisterLoggingInstance(); 190 RegisterLoggingInstance();
191 191
192 // Send hello message. 192 // Send hello message.
193 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); 193 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
194 data->SetInteger("apiVersion", kApiVersion); 194 data->SetInteger("apiVersion", kApiVersion);
195 data->SetString("apiFeatures", kApiFeatures); 195 data->SetString("apiFeatures", kApiFeatures);
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 url_components.scheme.len); 939 url_components.scheme.len);
940 return url_scheme == kChromeExtensionUrlScheme; 940 return url_scheme == kChromeExtensionUrlScheme;
941 } 941 }
942 942
943 bool ChromotingInstance::IsConnected() { 943 bool ChromotingInstance::IsConnected() {
944 return host_connection_.get() && 944 return host_connection_.get() &&
945 (host_connection_->state() == protocol::ConnectionToHost::CONNECTED); 945 (host_connection_->state() == protocol::ConnectionToHost::CONNECTED);
946 } 946 }
947 947
948 } // namespace remoting 948 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/chromoting_client.cc ('k') | remoting/client/plugin/pepper_network_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698