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

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

Issue 1410923004: Replace PluginThreadTaskRunner with a simpler MainPluginThreadTaskRunner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_mac_test
Patch Set: Created 5 years, 2 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
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 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ 5 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
6 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ 6 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
13 #include "ppapi/c/pp_instance.h" 13 #include "ppapi/c/pp_instance.h"
14 #include "ppapi/c/pp_rect.h" 14 #include "ppapi/c/pp_rect.h"
15 #include "ppapi/c/pp_resource.h" 15 #include "ppapi/c/pp_resource.h"
16 #include "ppapi/cpp/instance.h" 16 #include "ppapi/cpp/instance.h"
17 #include "ppapi/cpp/text_input_controller.h" 17 #include "ppapi/cpp/text_input_controller.h"
18 #include "ppapi/cpp/var.h" 18 #include "ppapi/cpp/var.h"
19 #include "remoting/client/client_context.h" 19 #include "remoting/client/client_context.h"
20 #include "remoting/client/client_user_interface.h" 20 #include "remoting/client/client_user_interface.h"
21 #include "remoting/client/empty_cursor_filter.h" 21 #include "remoting/client/empty_cursor_filter.h"
22 #include "remoting/client/key_event_mapper.h" 22 #include "remoting/client/key_event_mapper.h"
23 #include "remoting/client/plugin/pepper_cursor_setter.h" 23 #include "remoting/client/plugin/pepper_cursor_setter.h"
24 #include "remoting/client/plugin/pepper_input_handler.h" 24 #include "remoting/client/plugin/pepper_input_handler.h"
25 #include "remoting/client/plugin/pepper_plugin_thread_delegate.h"
26 #include "remoting/client/plugin/pepper_video_renderer.h" 25 #include "remoting/client/plugin/pepper_video_renderer.h"
27 #include "remoting/client/touch_input_scaler.h" 26 #include "remoting/client/touch_input_scaler.h"
28 #include "remoting/proto/event.pb.h" 27 #include "remoting/proto/event.pb.h"
29 #include "remoting/protocol/client_stub.h" 28 #include "remoting/protocol/client_stub.h"
30 #include "remoting/protocol/clipboard_stub.h" 29 #include "remoting/protocol/clipboard_stub.h"
31 #include "remoting/protocol/connection_to_host.h" 30 #include "remoting/protocol/connection_to_host.h"
32 #include "remoting/protocol/cursor_shape_stub.h" 31 #include "remoting/protocol/cursor_shape_stub.h"
33 #include "remoting/protocol/input_event_tracker.h" 32 #include "remoting/protocol/input_event_tracker.h"
34 #include "remoting/protocol/mouse_input_filter.h" 33 #include "remoting/protocol/mouse_input_filter.h"
35 #include "remoting/protocol/negotiating_client_authenticator.h" 34 #include "remoting/protocol/negotiating_client_authenticator.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 bool IsConnected(); 235 bool IsConnected();
237 236
238 // Used as the |FetchSecretCallback| for Me2Me connections. 237 // Used as the |FetchSecretCallback| for Me2Me connections.
239 // Uses the PIN request dialog in the webapp to obtain the shared secret. 238 // Uses the PIN request dialog in the webapp to obtain the shared secret.
240 void FetchSecretFromDialog( 239 void FetchSecretFromDialog(
241 bool pairing_supported, 240 bool pairing_supported,
242 const protocol::SecretFetchedCallback& secret_fetched_callback); 241 const protocol::SecretFetchedCallback& secret_fetched_callback);
243 242
244 bool initialized_; 243 bool initialized_;
245 244
246 PepperPluginThreadDelegate plugin_thread_delegate_; 245 scoped_refptr<base::SingleThreadTaskRunner> plugin_task_runner_;
247 scoped_refptr<PluginThreadTaskRunner> plugin_task_runner_;
248 scoped_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_; 246 scoped_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
249 scoped_ptr<jingle_glue::JingleThreadWrapper> thread_wrapper_; 247 scoped_ptr<jingle_glue::JingleThreadWrapper> thread_wrapper_;
250 ClientContext context_; 248 ClientContext context_;
251 protocol::PerformanceTracker perf_tracker_; 249 protocol::PerformanceTracker perf_tracker_;
252 scoped_ptr<PepperVideoRenderer> video_renderer_; 250 scoped_ptr<PepperVideoRenderer> video_renderer_;
253 pp::View plugin_view_; 251 pp::View plugin_view_;
254 252
255 // Contains the most-recently-reported desktop shape, if any. 253 // Contains the most-recently-reported desktop shape, if any.
256 scoped_ptr<webrtc::DesktopRegion> desktop_shape_; 254 scoped_ptr<webrtc::DesktopRegion> desktop_shape_;
257 255
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 289
292 // Weak reference to this instance, used for global logging and task posting. 290 // Weak reference to this instance, used for global logging and task posting.
293 base::WeakPtrFactory<ChromotingInstance> weak_factory_; 291 base::WeakPtrFactory<ChromotingInstance> weak_factory_;
294 292
295 DISALLOW_COPY_AND_ASSIGN(ChromotingInstance); 293 DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
296 }; 294 };
297 295
298 } // namespace remoting 296 } // namespace remoting
299 297
300 #endif // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_ 298 #endif // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
OLDNEW
« no previous file with comments | « remoting/base/plugin_thread_task_runner.cc ('k') | remoting/client/plugin/chromoting_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698