| 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..284e81cacdae2be9dbc9fdfd447095034d1d4e4f 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"
|
|
|
| @@ -20,17 +19,12 @@ class VIEWS_EXPORT DesktopDispatcherClient
|
| DesktopDispatcherClient();
|
| virtual ~DesktopDispatcherClient();
|
|
|
| - virtual void RunWithDispatcher(
|
| - base::MessagePumpDispatcher* dispatcher) OVERRIDE;
|
| - virtual void QuitNestedMessageLoop() OVERRIDE;
|
| + virtual void PrepareNestedLoopClosures(
|
| + base::MessagePumpDispatcher* dispatcher,
|
| + base::Closure* run_closure,
|
| + base::Closure* quit_closure) 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);
|
| };
|
|
|
|
|