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/host/host_user_interface.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'remoting/host/host_user_interface.h') diff --git a/remoting/host/host_user_interface.h b/remoting/host/host_user_interface.h index 942cd2a..9c2729e 100644 --- a/remoting/host/host_user_interface.h +++ b/remoting/host/host_user_interface.h @@ -11,8 +11,8 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/weak_ptr.h" -#include "base/message_loop_proxy.h" + +#include "remoting/base/scoped_thread_proxy.h" #include "remoting/host/host_status_observer.h" namespace remoting { @@ -95,9 +95,7 @@ class HostUserInterface : public HostStatusObserver { bool is_monitoring_local_inputs_; - // WeakPtr used to avoid tasks accessing the client after it is deleted. - base::WeakPtrFactory weak_factory_; - base::WeakPtr weak_ptr_; + ScopedThreadProxy ui_thread_proxy_; DISALLOW_COPY_AND_ASSIGN(HostUserInterface); }; -- cgit v1.1