| Index: remoting/base/plugin_message_loop_proxy.cc
|
| diff --git a/remoting/base/plugin_message_loop_proxy.cc b/remoting/base/plugin_message_loop_proxy.cc
|
| index 7cd03a4d237fb8b8a52a21888e9371528becf763..9d9a5990398ebbc5a7feca0dd36bd073319d5d7f 100644
|
| --- a/remoting/base/plugin_message_loop_proxy.cc
|
| +++ b/remoting/base/plugin_message_loop_proxy.cc
|
| @@ -28,6 +28,14 @@ bool PluginMessageLoopProxy::PostDelayedTask(
|
| const tracked_objects::Location& from_here,
|
| const base::Closure& task,
|
| int64 delay_ms) {
|
| + return PostDelayedTask(
|
| + from_here, task, base::TimeDelta::FromMilliseconds(delay_ms));
|
| +}
|
| +
|
| +bool PluginMessageLoopProxy::PostDelayedTask(
|
| + const tracked_objects::Location& from_here,
|
| + const base::Closure& task,
|
| + base::TimeDelta delay) {
|
| base::AutoLock auto_lock(lock_);
|
| if (!delegate_)
|
| return false;
|
| @@ -35,7 +43,7 @@ bool PluginMessageLoopProxy::PostDelayedTask(
|
| base::Closure* springpad_closure = new base::Closure(base::Bind(
|
| &PluginMessageLoopProxy::RunClosureIf, this, task));
|
| return delegate_->RunOnPluginThread(
|
| - delay_ms, &PluginMessageLoopProxy::TaskSpringboard, springpad_closure);
|
| + delay, &PluginMessageLoopProxy::TaskSpringboard, springpad_closure);
|
| }
|
|
|
| bool PluginMessageLoopProxy::PostNonNestableDelayedTask(
|
| @@ -46,6 +54,14 @@ bool PluginMessageLoopProxy::PostNonNestableDelayedTask(
|
| return PostDelayedTask(from_here, task, delay_ms);
|
| }
|
|
|
| +bool PluginMessageLoopProxy::PostNonNestableDelayedTask(
|
| + const tracked_objects::Location& from_here,
|
| + const base::Closure& task,
|
| + base::TimeDelta delay) {
|
| + // All tasks running on this message loop are non-nestable.
|
| + return PostDelayedTask(from_here, task, delay);
|
| +}
|
| +
|
| bool PluginMessageLoopProxy::RunsTasksOnCurrentThread() const {
|
| // In pepper plugins ideally we should use pp::Core::IsMainThread,
|
| // but it is problematic because we would need to keep reference to
|
|
|