Chromium Code Reviews| Index: ash/shell.h |
| diff --git a/ash/shell.h b/ash/shell.h |
| index 313a75dc618906dd83c4589748bb5aa08620ca79..d4e089cd5a7ad3ccd84bd400937dc93b37c5497f 100644 |
| --- a/ash/shell.h |
| +++ b/ash/shell.h |
| @@ -117,6 +117,7 @@ class StickyKeysController; |
| class SystemGestureEventFilter; |
| class SystemModalContainerEventFilter; |
| class SystemTray; |
| +class TabletPowerButtonController; |
|
Daniel Erat
2016/11/11 05:40:50
nit: this should probably be in an ifdef too
Qiang(Joe) Xu
2016/11/11 18:19:30
done by removing
|
| class ToplevelWindowEventHandler; |
| class TouchTransformerController; |
| class TouchObserverHUD; |
| @@ -278,6 +279,9 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, |
| PartialMagnificationController* partial_magnification_controller() { |
| return partial_magnification_controller_.get(); |
| } |
| + TabletPowerButtonController* tablet_power_button_controller() { |
| + return tablet_power_button_controller_.get(); |
| + } |
| #endif // defined(OS_CHROMEOS) |
| ScreenshotController* screenshot_controller() { |
| return screenshot_controller_.get(); |
| @@ -529,6 +533,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, |
| std::unique_ptr<LaserPointerController> laser_pointer_controller_; |
| std::unique_ptr<PartialMagnificationController> |
| partial_magnification_controller_; |
| + std::unique_ptr<TabletPowerButtonController> tablet_power_button_controller_; |
|
Daniel Erat
2016/11/11 05:40:50
you can probably avoid moving this to ash::Shell b
Qiang(Joe) Xu
2016/11/11 18:19:30
Done.
|
| #endif // defined(OS_CHROMEOS) |
| // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a |