Index: remoting/host/host_user_interface.h |
diff --git a/remoting/host/host_user_interface.h b/remoting/host/host_user_interface.h |
index 9c2729ee01253f817c424b306e5ff0a60a4551ca..942cd2a2b920241c0ec0e563464b7d18a5b991e2 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 "remoting/base/scoped_thread_proxy.h" |
+#include "base/memory/weak_ptr.h" |
+#include "base/message_loop_proxy.h" |
#include "remoting/host/host_status_observer.h" |
namespace remoting { |
@@ -95,7 +95,9 @@ class HostUserInterface : public HostStatusObserver { |
bool is_monitoring_local_inputs_; |
- ScopedThreadProxy ui_thread_proxy_; |
+ // WeakPtr used to avoid tasks accessing the client after it is deleted. |
+ base::WeakPtrFactory<HostUserInterface> weak_factory_; |
+ base::WeakPtr<HostUserInterface> weak_ptr_; |
DISALLOW_COPY_AND_ASSIGN(HostUserInterface); |
}; |