From b6791a77ae5c2eec843b8c9b4ad3d9fa9c11fda7 Mon Sep 17 00:00:00 2001 From: "wez@chromium.org" Date: Wed, 30 May 2012 21:09:33 +0000 Subject: Revert 139623 - Replace ScopedThreadProxy with MessageLoopProxy & WeakPtrs. This affects the following classes: * ChromotingClient * ChromotingInstance * HostUserInterface * It2MeHostUserInterface The MessageLoopProxy/WeakPtr combination requires that the WeakPtr is created on the thread referred to by the proxy; code in which that is hard to arrange usually has subtle race-conditions. TEST=Existing unit-tests, and manual testing. Review URL: https://chromiumcodereview.appspot.com/10454040 TBR=wez@chromium.org Review URL: https://chromiumcodereview.appspot.com/10446088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139633 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/client/plugin/chromoting_instance.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'remoting/client/plugin/chromoting_instance.h') diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index 0f1bdde..a489bde 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -25,6 +25,7 @@ #endif #include "ppapi/cpp/private/instance_private.h" +#include "remoting/base/scoped_thread_proxy.h" #include "remoting/client/client_context.h" #include "remoting/client/key_event_mapper.h" #include "remoting/client/plugin/mac_key_event_processor.h" @@ -224,7 +225,7 @@ class ChromotingInstance : // This wraps a ChromotingScriptableObject in a pp::Var. pp::Var instance_object_; - base::WeakPtrFactory weak_factory_; + scoped_ptr thread_proxy_; DISALLOW_COPY_AND_ASSIGN(ChromotingInstance); }; -- cgit v1.1