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

Side by Side Diff: remoting/client/plugin/chromoting_instance.cc

Issue 876433003: Fix JingleThreadWrapper initialization in PNaCl plugin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@db
Patch Set: Created 5 years, 10 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
« no previous file with comments | « jingle/glue/thread_wrapper.cc ('k') | no next file » | 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 #if defined(OS_NACL) 10 #if defined(OS_NACL)
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 ProcessLogToUI("Initializing thread wrapper");
rmsousa 2015/01/27 00:48:48 Is this a debugging leftover?
Sergey Ulanov 2015/01/27 01:27:29 Yes. Thanks!
202 new jingle_glue::JingleThreadWrapper(plugin_task_runner_)); 202 thread_wrapper_ =
203 jingle_glue::JingleThreadWrapper::WrapTaskRunner(plugin_task_runner_);
203 media::InitializeCPUSpecificYUVConversions(); 204 media::InitializeCPUSpecificYUVConversions();
204 205
205 // Register a global log handler. 206 // Register a global log handler.
206 ChromotingInstance::RegisterLogMessageHandler(); 207 ChromotingInstance::RegisterLogMessageHandler();
207 #else 208 #else
208 jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); 209 jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
209 #endif 210 #endif
210 211
211 #if defined(OS_NACL) 212 #if defined(OS_NACL)
212 nacl_io_init_ppapi(pp_instance, pp::Module::Get()->get_browser_interface()); 213 nacl_io_init_ppapi(pp_instance, pp::Module::Get()->get_browser_interface());
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 url_components.scheme.len); 1131 url_components.scheme.len);
1131 return url_scheme == kChromeExtensionUrlScheme; 1132 return url_scheme == kChromeExtensionUrlScheme;
1132 } 1133 }
1133 1134
1134 bool ChromotingInstance::IsConnected() { 1135 bool ChromotingInstance::IsConnected() {
1135 return client_ && 1136 return client_ &&
1136 (client_->connection_state() == protocol::ConnectionToHost::CONNECTED); 1137 (client_->connection_state() == protocol::ConnectionToHost::CONNECTED);
1137 } 1138 }
1138 1139
1139 } // namespace remoting 1140 } // namespace remoting
OLDNEW
« no previous file with comments | « jingle/glue/thread_wrapper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698