Index: ui/views/widget/desktop_aura/desktop_dispatcher_client.h |
diff --git a/ui/views/widget/desktop_aura/desktop_dispatcher_client.h b/ui/views/widget/desktop_aura/desktop_dispatcher_client.h |
index 5351d8a1b7645a0e2388ad95c9af51d16a8d05ea..0a4b6289df387e2422b11dc1a15f36bb0c24c918 100644 |
--- a/ui/views/widget/desktop_aura/desktop_dispatcher_client.h |
+++ b/ui/views/widget/desktop_aura/desktop_dispatcher_client.h |
@@ -7,7 +7,6 @@ |
#include "base/basictypes.h" |
#include "base/callback.h" |
-#include "base/memory/weak_ptr.h" |
#include "ui/views/views_export.h" |
#include "ui/wm/public/dispatcher_client.h" |
@@ -21,16 +20,10 @@ class VIEWS_EXPORT DesktopDispatcherClient |
virtual ~DesktopDispatcherClient(); |
virtual void RunWithDispatcher( |
- base::MessagePumpDispatcher* dispatcher) OVERRIDE; |
- virtual void QuitNestedMessageLoop() OVERRIDE; |
+ base::MessagePumpDispatcher* dispatcher, |
+ base::Closure* quit_runloop) OVERRIDE; |
private: |
- base::Closure quit_closure_; |
- |
- // Used to keep track of whether the client has been destroyed while the |
- // nested loop was running. |
- base::WeakPtrFactory<DesktopDispatcherClient> weak_ptr_factory_; |
- |
DISALLOW_COPY_AND_ASSIGN(DesktopDispatcherClient); |
}; |