| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ | 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ |
| 6 #define ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ | 6 #define ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/accelerators/accelerator_controller_delegate.h" | 10 #include "ash/common/accelerators/accelerator_controller_delegate.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 | 14 |
| 15 class ScreenshotDelegate; | 15 class ScreenshotDelegate; |
| 16 | 16 |
| 17 // Contains all the accelerators that have dependencies on portions of ash | 17 // Contains all the accelerators that have dependencies on portions of ash |
| 18 // not yet converted to ash/common. | 18 // not yet converted to ash/common. |
| 19 class ASH_EXPORT AcceleratorControllerDelegateAura | 19 class ASH_EXPORT AcceleratorControllerDelegateAura |
| 20 : public AcceleratorControllerDelegate { | 20 : public AcceleratorControllerDelegate { |
| (...skipping 21 matching lines...) Expand all Loading... |
| 42 | 42 |
| 43 private: | 43 private: |
| 44 std::unique_ptr<ScreenshotDelegate> screenshot_delegate_; | 44 std::unique_ptr<ScreenshotDelegate> screenshot_delegate_; |
| 45 | 45 |
| 46 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateAura); | 46 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerDelegateAura); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 } // namespace ash | 49 } // namespace ash |
| 50 | 50 |
| 51 #endif // ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ | 51 #endif // ASH_ACCELERATORS_ACCELERATOR_HANDLER_AURA_H_ |
| OLD | NEW |