| Index: ash/accelerators/accelerator_controller.h
|
| diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
|
| index b121807e7f194a2e559980b8c91dd5c410ef13ac..085156bfb8e10532140ffb7bcbea396e907ee1ee 100644
|
| --- a/ash/accelerators/accelerator_controller.h
|
| +++ b/ash/accelerators/accelerator_controller.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ash/ash_export.h"
|
| +#include "ui/aura/client/accelerator_client.h"
|
| #include "ui/base/accelerators/accelerator.h"
|
|
|
| namespace ui {
|
| @@ -26,7 +27,8 @@ class CapsLockDelegate;
|
| // AcceleratorController provides functions for registering or unregistering
|
| // global keyboard accelerators, which are handled earlier than any windows. It
|
| // also implements several handlers as an accelerator target.
|
| -class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
|
| +class ASH_EXPORT AcceleratorController : public aura::client::AcceleratorClient,
|
| + public ui::AcceleratorTarget {
|
| public:
|
| AcceleratorController();
|
| virtual ~AcceleratorController();
|
|
|