diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 21:09:33 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 21:09:33 +0000 |
| commit | b6791a77ae5c2eec843b8c9b4ad3d9fa9c11fda7 (patch) | |
| tree | 608a649c16b2af968a0d250ba1c30b118e6bb3ba /remoting/client/plugin/chromoting_instance.h | |
| parent | 910875d9a35955b0e51d150c40879eb892250155 (diff) | |
| download | chromium_src-b6791a77ae5c2eec843b8c9b4ad3d9fa9c11fda7.zip chromium_src-b6791a77ae5c2eec843b8c9b4ad3d9fa9c11fda7.tar.gz chromium_src-b6791a77ae5c2eec843b8c9b4ad3d9fa9c11fda7.tar.bz2 | |
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
Diffstat (limited to 'remoting/client/plugin/chromoting_instance.h')
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.h | 3 |
1 files changed, 2 insertions, 1 deletions
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<ChromotingInstance> weak_factory_; + scoped_ptr<ScopedThreadProxy> thread_proxy_; DISALLOW_COPY_AND_ASSIGN(ChromotingInstance); }; |