| Index: trunk/src/ash/accelerators/accelerator_dispatcher.h
|
| ===================================================================
|
| --- trunk/src/ash/accelerators/accelerator_dispatcher.h (revision 245238)
|
| +++ trunk/src/ash/accelerators/accelerator_dispatcher.h (working copy)
|
| @@ -6,7 +6,7 @@
|
| #define ASH_ACCELERATORS_ACCELERATOR_DISPATCHER_H_
|
|
|
| #include "ash/ash_export.h"
|
| -#include "base/message_loop/message_pump_dispatcher.h"
|
| +#include "base/message_loop/message_loop.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_observer.h"
|
|
|
| @@ -19,21 +19,21 @@
|
| // TODO(pkotwicz): Port AcceleratorDispatcher to mac.
|
| // TODO(pkotwicz): Add support for a |nested_dispatcher| which sends
|
| // events to a system IME.
|
| -class ASH_EXPORT AcceleratorDispatcher : public base::MessagePumpDispatcher,
|
| +class ASH_EXPORT AcceleratorDispatcher : public base::MessageLoop::Dispatcher,
|
| public aura::WindowObserver {
|
| public:
|
| - AcceleratorDispatcher(base::MessagePumpDispatcher* nested_dispatcher,
|
| + AcceleratorDispatcher(base::MessageLoop::Dispatcher* nested_dispatcher,
|
| aura::Window* associated_window);
|
| virtual ~AcceleratorDispatcher();
|
|
|
| - // MessagePumpDispatcher overrides:
|
| + // MessageLoop::Dispatcher overrides:
|
| virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
|
|
|
| // aura::WindowObserver overrides:
|
| virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
|
|
|
| private:
|
| - base::MessagePumpDispatcher* nested_dispatcher_;
|
| + base::MessageLoop::Dispatcher* nested_dispatcher_;
|
|
|
| // Window associated with |nested_dispatcher_| which is used to determine
|
| // whether the |nested_dispatcher_| is allowed to receive events.
|
|
|