OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_SHELL_H_ | 5 #ifndef ASH_SHELL_H_ |
6 #define ASH_SHELL_H_ | 6 #define ASH_SHELL_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
110 class ScreenPositionController; | 110 class ScreenPositionController; |
111 class SessionStateDelegate; | 111 class SessionStateDelegate; |
112 class ShellDelegate; | 112 class ShellDelegate; |
113 struct ShellInitParams; | 113 struct ShellInitParams; |
114 class SlowAnimationEventFilter; | 114 class SlowAnimationEventFilter; |
115 class StatusAreaWidget; | 115 class StatusAreaWidget; |
116 class StickyKeysController; | 116 class StickyKeysController; |
117 class SystemGestureEventFilter; | 117 class SystemGestureEventFilter; |
118 class SystemModalContainerEventFilter; | 118 class SystemModalContainerEventFilter; |
119 class SystemTray; | 119 class SystemTray; |
120 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
| |
120 class ToplevelWindowEventHandler; | 121 class ToplevelWindowEventHandler; |
121 class TouchTransformerController; | 122 class TouchTransformerController; |
122 class TouchObserverHUD; | 123 class TouchObserverHUD; |
123 class ScreenLayoutObserver; | 124 class ScreenLayoutObserver; |
124 class VirtualKeyboardController; | 125 class VirtualKeyboardController; |
125 class VideoActivityNotifier; | 126 class VideoActivityNotifier; |
126 class VideoDetector; | 127 class VideoDetector; |
127 class WebNotificationTray; | 128 class WebNotificationTray; |
128 class WindowPositioner; | 129 class WindowPositioner; |
129 class WindowTreeHostManager; | 130 class WindowTreeHostManager; |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
271 } | 272 } |
272 TouchTransformerController* touch_transformer_controller() { | 273 TouchTransformerController* touch_transformer_controller() { |
273 return touch_transformer_controller_.get(); | 274 return touch_transformer_controller_.get(); |
274 } | 275 } |
275 LaserPointerController* laser_pointer_controller() { | 276 LaserPointerController* laser_pointer_controller() { |
276 return laser_pointer_controller_.get(); | 277 return laser_pointer_controller_.get(); |
277 } | 278 } |
278 PartialMagnificationController* partial_magnification_controller() { | 279 PartialMagnificationController* partial_magnification_controller() { |
279 return partial_magnification_controller_.get(); | 280 return partial_magnification_controller_.get(); |
280 } | 281 } |
282 TabletPowerButtonController* tablet_power_button_controller() { | |
283 return tablet_power_button_controller_.get(); | |
284 } | |
281 #endif // defined(OS_CHROMEOS) | 285 #endif // defined(OS_CHROMEOS) |
282 ScreenshotController* screenshot_controller() { | 286 ScreenshotController* screenshot_controller() { |
283 return screenshot_controller_.get(); | 287 return screenshot_controller_.get(); |
284 } | 288 } |
285 MouseCursorEventFilter* mouse_cursor_filter() { | 289 MouseCursorEventFilter* mouse_cursor_filter() { |
286 return mouse_cursor_filter_.get(); | 290 return mouse_cursor_filter_.get(); |
287 } | 291 } |
288 EventTransformationHandler* event_transformation_handler() { | 292 EventTransformationHandler* event_transformation_handler() { |
289 return event_transformation_handler_.get(); | 293 return event_transformation_handler_.get(); |
290 } | 294 } |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
522 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; | 526 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; |
523 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; | 527 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; |
524 | 528 |
525 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; | 529 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; |
526 | 530 |
527 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; | 531 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; |
528 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; | 532 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; |
529 std::unique_ptr<LaserPointerController> laser_pointer_controller_; | 533 std::unique_ptr<LaserPointerController> laser_pointer_controller_; |
530 std::unique_ptr<PartialMagnificationController> | 534 std::unique_ptr<PartialMagnificationController> |
531 partial_magnification_controller_; | 535 partial_magnification_controller_; |
536 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.
| |
532 #endif // defined(OS_CHROMEOS) | 537 #endif // defined(OS_CHROMEOS) |
533 | 538 |
534 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a | 539 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a |
535 // pointer to vend to test code. | 540 // pointer to vend to test code. |
536 AshNativeCursorManager* native_cursor_manager_; | 541 AshNativeCursorManager* native_cursor_manager_; |
537 | 542 |
538 // Cursor may be hidden on certain key events in ChromeOS, whereas we never | 543 // Cursor may be hidden on certain key events in ChromeOS, whereas we never |
539 // hide the cursor on Windows. | 544 // hide the cursor on Windows. |
540 std::unique_ptr<::wm::CursorManager> cursor_manager_; | 545 std::unique_ptr<::wm::CursorManager> cursor_manager_; |
541 | 546 |
542 // For testing only: simulate that a modal window is open | 547 // For testing only: simulate that a modal window is open |
543 bool simulate_modal_window_open_for_testing_; | 548 bool simulate_modal_window_open_for_testing_; |
544 | 549 |
545 bool is_touch_hud_projection_enabled_; | 550 bool is_touch_hud_projection_enabled_; |
546 | 551 |
547 // Injected content::GPUDataManager support. | 552 // Injected content::GPUDataManager support. |
548 std::unique_ptr<GPUSupport> gpu_support_; | 553 std::unique_ptr<GPUSupport> gpu_support_; |
549 | 554 |
550 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; | 555 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; |
551 | 556 |
552 DISALLOW_COPY_AND_ASSIGN(Shell); | 557 DISALLOW_COPY_AND_ASSIGN(Shell); |
553 }; | 558 }; |
554 | 559 |
555 } // namespace ash | 560 } // namespace ash |
556 | 561 |
557 #endif // ASH_SHELL_H_ | 562 #endif // ASH_SHELL_H_ |
OLD | NEW |