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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: remoting/client/plugin/chromoting_instance.h
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index a07ecf6fd492272291a2f1b7f588fd80e9d908e3..35a70503e190c42138e34b5074b6fa3885a8ba48 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -20,9 +20,9 @@
#include "remoting/client/client_user_interface.h"
#include "remoting/client/empty_cursor_filter.h"
#include "remoting/client/key_event_mapper.h"
+#include "remoting/client/plugin/main_plugin_thread_task_runner.h"
#include "remoting/client/plugin/pepper_cursor_setter.h"
#include "remoting/client/plugin/pepper_input_handler.h"
-#include "remoting/client/plugin/pepper_plugin_thread_delegate.h"
#include "remoting/client/plugin/pepper_video_renderer.h"
#include "remoting/client/touch_input_scaler.h"
#include "remoting/proto/event.pb.h"
@@ -243,8 +243,7 @@ class ChromotingInstance : public ClientUserInterface,
bool initialized_;
- PepperPluginThreadDelegate plugin_thread_delegate_;
- scoped_refptr<PluginThreadTaskRunner> plugin_task_runner_;
+ scoped_refptr<MainPluginThreadTaskRunner> plugin_task_runner_;
Wez 2015/10/20 23:05:48 Does the ChromotingInstance need to know that this
Sergey Ulanov 2015/10/20 23:28:05 Done.
scoped_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
scoped_ptr<jingle_glue::JingleThreadWrapper> thread_wrapper_;
ClientContext context_;

Powered by Google App Engine
This is Rietveld 408576698