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/host/it2me_host_user_interface.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/host/it2me_host_user_interface.h')
| -rw-r--r-- | remoting/host/it2me_host_user_interface.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/remoting/host/it2me_host_user_interface.h b/remoting/host/it2me_host_user_interface.h index 71619ea..b054c65 100644 --- a/remoting/host/it2me_host_user_interface.h +++ b/remoting/host/it2me_host_user_interface.h @@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/weak_ptr.h" #include "remoting/host/host_user_interface.h" @@ -68,9 +67,8 @@ class It2MeHostUserInterface : public HostUserInterface { // the connection. scoped_ptr<ContinueWindow> continue_window_; - // Weak pointer factory used to abandon the "continue session" timer when - // hiding the "continue session" dialog, or tearing down the IT2Me UI. - base::WeakPtrFactory<It2MeHostUserInterface> timer_weak_factory_; + // Timer controlling the "continue session" dialog. + scoped_ptr<TimerTask> timer_task_; DISALLOW_COPY_AND_ASSIGN(It2MeHostUserInterface); }; |