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

Unified Diff: remoting/client/plugin/chromoting_instance.cc

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.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 755b46fed33c4c3f2c71f5c9c22f730e4748452a..c775e341daa319667b5891fc814a399ac7b2fc96 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -137,7 +137,7 @@ base::LazyInstance<base::Lock>::Leaky g_logging_lock =
ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
: pp::Instance(pp_instance),
initialized_(false),
- plugin_task_runner_(new PluginThreadTaskRunner(&plugin_thread_delegate_)),
+ plugin_task_runner_(new MainPluginThreadTaskRunner()),
context_(plugin_task_runner_.get()),
input_tracker_(&mouse_input_filter_),
touch_input_scaler_(&input_tracker_),
@@ -192,11 +192,6 @@ ChromotingInstance::~ChromotingInstance() {
// to it. This will stop all logging in all Chromoting instances.
UnregisterLoggingInstance();
- plugin_task_runner_->Quit();
-
- // Ensure that nothing touches the plugin thread delegate after this point.
- plugin_task_runner_->DetachAndRunShutdownLoop();
-
// Stopping the context shuts down all chromoting threads.
context_.Stop();
}

Powered by Google App Engine
This is Rietveld 408576698