| Index: remoting/host/host_user_interface.h
|
| diff --git a/remoting/host/host_user_interface.h b/remoting/host/host_user_interface.h
|
| index 806361fa8e45de8a55eb0d8fd9958f8108a8f412..9449975bd3ee8981dbc1de549050ac3b16abaeac 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 {
|
| @@ -100,7 +100,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_;
|
|
|
| bool disable_disconnect_shortcut_on_mac_;
|
|
|
|
|