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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 class SlowAnimationEventFilter; | 117 class SlowAnimationEventFilter; |
118 class StatusAreaWidget; | 118 class StatusAreaWidget; |
119 class StickyKeysController; | 119 class StickyKeysController; |
120 class StylusMetricsRecorder; | 120 class StylusMetricsRecorder; |
121 class SystemGestureEventFilter; | 121 class SystemGestureEventFilter; |
122 class SystemModalContainerEventFilter; | 122 class SystemModalContainerEventFilter; |
123 class SystemTray; | 123 class SystemTray; |
124 class ToplevelWindowEventHandler; | 124 class ToplevelWindowEventHandler; |
125 class TouchTransformerController; | 125 class TouchTransformerController; |
126 class TouchObserverHUD; | 126 class TouchObserverHUD; |
| 127 class ScreenLayoutObserver; |
127 class VirtualKeyboardController; | 128 class VirtualKeyboardController; |
128 class VideoActivityNotifier; | 129 class VideoActivityNotifier; |
129 class VideoDetector; | 130 class VideoDetector; |
130 class WallpaperController; | 131 class WallpaperController; |
131 class WebNotificationTray; | 132 class WebNotificationTray; |
132 class WindowPositioner; | 133 class WindowPositioner; |
133 class WindowTreeHostManager; | 134 class WindowTreeHostManager; |
134 class WmShellAura; | 135 class WmShellAura; |
135 class WmWindow; | 136 class WmWindow; |
136 | 137 |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 | 379 |
379 #if defined(OS_CHROMEOS) | 380 #if defined(OS_CHROMEOS) |
380 // TODO(oshima): Move these objects to WindowTreeHostManager. | 381 // TODO(oshima): Move these objects to WindowTreeHostManager. |
381 ui::DisplayConfigurator* display_configurator() { | 382 ui::DisplayConfigurator* display_configurator() { |
382 return display_configurator_.get(); | 383 return display_configurator_.get(); |
383 } | 384 } |
384 DisplayErrorObserver* display_error_observer() { | 385 DisplayErrorObserver* display_error_observer() { |
385 return display_error_observer_.get(); | 386 return display_error_observer_.get(); |
386 } | 387 } |
387 | 388 |
| 389 ScreenLayoutObserver* screen_layout_observer() { |
| 390 return screen_layout_observer_.get(); |
| 391 } |
| 392 |
388 ResolutionNotificationController* resolution_notification_controller() { | 393 ResolutionNotificationController* resolution_notification_controller() { |
389 return resolution_notification_controller_.get(); | 394 return resolution_notification_controller_.get(); |
390 } | 395 } |
391 | 396 |
392 ScreenOrientationController* screen_orientation_controller() { | 397 ScreenOrientationController* screen_orientation_controller() { |
393 return screen_orientation_controller_.get(); | 398 return screen_orientation_controller_.get(); |
394 } | 399 } |
395 | 400 |
396 VirtualKeyboardController* virtual_keyboard_controller() { | 401 VirtualKeyboardController* virtual_keyboard_controller() { |
397 return virtual_keyboard_controller_.get(); | 402 return virtual_keyboard_controller_.get(); |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
554 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; | 559 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; |
555 std::unique_ptr<DisplayColorManager> display_color_manager_; | 560 std::unique_ptr<DisplayColorManager> display_color_manager_; |
556 std::unique_ptr<DisplayErrorObserver> display_error_observer_; | 561 std::unique_ptr<DisplayErrorObserver> display_error_observer_; |
557 std::unique_ptr<ProjectingObserver> projecting_observer_; | 562 std::unique_ptr<ProjectingObserver> projecting_observer_; |
558 | 563 |
559 // Listens for output changes and updates the display manager. | 564 // Listens for output changes and updates the display manager. |
560 std::unique_ptr<DisplayChangeObserver> display_change_observer_; | 565 std::unique_ptr<DisplayChangeObserver> display_change_observer_; |
561 | 566 |
562 // Implements content::ScreenOrientationController for ChromeOS | 567 // Implements content::ScreenOrientationController for ChromeOS |
563 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; | 568 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; |
| 569 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; |
564 | 570 |
565 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; | 571 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; |
566 | 572 |
567 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; | 573 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; |
568 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; | 574 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; |
569 std::unique_ptr<StylusMetricsRecorder> stylus_metrics_recorder_; | 575 std::unique_ptr<StylusMetricsRecorder> stylus_metrics_recorder_; |
570 #endif // defined(OS_CHROMEOS) | 576 #endif // defined(OS_CHROMEOS) |
571 | 577 |
572 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a | 578 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a |
573 // pointer to vend to test code. | 579 // pointer to vend to test code. |
(...skipping 16 matching lines...) Expand all Loading... |
590 base::SequencedWorkerPool* blocking_pool_; | 596 base::SequencedWorkerPool* blocking_pool_; |
591 | 597 |
592 bool in_mus_ = false; | 598 bool in_mus_ = false; |
593 | 599 |
594 DISALLOW_COPY_AND_ASSIGN(Shell); | 600 DISALLOW_COPY_AND_ASSIGN(Shell); |
595 }; | 601 }; |
596 | 602 |
597 } // namespace ash | 603 } // namespace ash |
598 | 604 |
599 #endif // ASH_SHELL_H_ | 605 #endif // ASH_SHELL_H_ |
OLD | NEW |