OLD | NEW |
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 #if defined(OS_NACL) | 10 #if defined(OS_NACL) |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 cursor_setter_(this), | 191 cursor_setter_(this), |
192 empty_cursor_filter_(&cursor_setter_), | 192 empty_cursor_filter_(&cursor_setter_), |
193 text_input_controller_(this), | 193 text_input_controller_(this), |
194 use_async_pin_dialog_(false), | 194 use_async_pin_dialog_(false), |
195 weak_factory_(this) { | 195 weak_factory_(this) { |
196 #if defined(OS_NACL) | 196 #if defined(OS_NACL) |
197 // In NaCl global resources need to be initialized differently because they | 197 // In NaCl global resources need to be initialized differently because they |
198 // are not shared with Chrome. | 198 // are not shared with Chrome. |
199 thread_task_runner_handle_.reset( | 199 thread_task_runner_handle_.reset( |
200 new base::ThreadTaskRunnerHandle(plugin_task_runner_)); | 200 new base::ThreadTaskRunnerHandle(plugin_task_runner_)); |
201 thread_wrapper_.reset( | 201 thread_wrapper_ = |
202 new jingle_glue::JingleThreadWrapper(plugin_task_runner_)); | 202 jingle_glue::JingleThreadWrapper::WrapTaskRunner(plugin_task_runner_); |
203 media::InitializeCPUSpecificYUVConversions(); | 203 media::InitializeCPUSpecificYUVConversions(); |
204 | 204 |
205 // Register a global log handler. | 205 // Register a global log handler. |
206 ChromotingInstance::RegisterLogMessageHandler(); | 206 ChromotingInstance::RegisterLogMessageHandler(); |
207 #else | 207 #else |
208 jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); | 208 jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); |
209 #endif | 209 #endif |
210 | 210 |
211 #if defined(OS_NACL) | 211 #if defined(OS_NACL) |
212 nacl_io_init_ppapi(pp_instance, pp::Module::Get()->get_browser_interface()); | 212 nacl_io_init_ppapi(pp_instance, pp::Module::Get()->get_browser_interface()); |
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1130 url_components.scheme.len); | 1130 url_components.scheme.len); |
1131 return url_scheme == kChromeExtensionUrlScheme; | 1131 return url_scheme == kChromeExtensionUrlScheme; |
1132 } | 1132 } |
1133 | 1133 |
1134 bool ChromotingInstance::IsConnected() { | 1134 bool ChromotingInstance::IsConnected() { |
1135 return client_ && | 1135 return client_ && |
1136 (client_->connection_state() == protocol::ConnectionToHost::CONNECTED); | 1136 (client_->connection_state() == protocol::ConnectionToHost::CONNECTED); |
1137 } | 1137 } |
1138 | 1138 |
1139 } // namespace remoting | 1139 } // namespace remoting |
OLD | NEW |