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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 struct ShellInitParams; | 121 struct ShellInitParams; |
122 class SlowAnimationEventFilter; | 122 class SlowAnimationEventFilter; |
123 class StatusAreaWidget; | 123 class StatusAreaWidget; |
124 class StickyKeysController; | 124 class StickyKeysController; |
125 class SystemGestureEventFilter; | 125 class SystemGestureEventFilter; |
126 class SystemModalContainerEventFilter; | 126 class SystemModalContainerEventFilter; |
127 class SystemTray; | 127 class SystemTray; |
128 class ToplevelWindowEventHandler; | 128 class ToplevelWindowEventHandler; |
129 class TouchTransformerController; | 129 class TouchTransformerController; |
130 class TouchObserverHUD; | 130 class TouchObserverHUD; |
| 131 class ScreenLayoutObserver; |
131 class UserWallpaperDelegate; | 132 class UserWallpaperDelegate; |
132 class VirtualKeyboardController; | 133 class VirtualKeyboardController; |
133 class VideoActivityNotifier; | 134 class VideoActivityNotifier; |
134 class VideoDetector; | 135 class VideoDetector; |
135 class WebNotificationTray; | 136 class WebNotificationTray; |
136 class WindowPositioner; | 137 class WindowPositioner; |
137 class WmShellAura; | 138 class WmShellAura; |
138 class WmWindow; | 139 class WmWindow; |
139 | 140 |
140 namespace shell { | 141 namespace shell { |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 | 406 |
406 #if defined(OS_CHROMEOS) | 407 #if defined(OS_CHROMEOS) |
407 // TODO(oshima): Move these objects to WindowTreeHostManager. | 408 // TODO(oshima): Move these objects to WindowTreeHostManager. |
408 ui::DisplayConfigurator* display_configurator() { | 409 ui::DisplayConfigurator* display_configurator() { |
409 return display_configurator_.get(); | 410 return display_configurator_.get(); |
410 } | 411 } |
411 DisplayErrorObserver* display_error_observer() { | 412 DisplayErrorObserver* display_error_observer() { |
412 return display_error_observer_.get(); | 413 return display_error_observer_.get(); |
413 } | 414 } |
414 | 415 |
| 416 ScreenLayoutObserver* screen_layout_observer() { |
| 417 return screen_layout_observer_.get(); |
| 418 } |
| 419 |
415 ResolutionNotificationController* resolution_notification_controller() { | 420 ResolutionNotificationController* resolution_notification_controller() { |
416 return resolution_notification_controller_.get(); | 421 return resolution_notification_controller_.get(); |
417 } | 422 } |
418 | 423 |
419 ScreenOrientationController* screen_orientation_controller() { | 424 ScreenOrientationController* screen_orientation_controller() { |
420 return screen_orientation_controller_.get(); | 425 return screen_orientation_controller_.get(); |
421 } | 426 } |
422 | 427 |
423 VirtualKeyboardController* virtual_keyboard_controller() { | 428 VirtualKeyboardController* virtual_keyboard_controller() { |
424 return virtual_keyboard_controller_.get(); | 429 return virtual_keyboard_controller_.get(); |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
586 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; | 591 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; |
587 std::unique_ptr<DisplayColorManager> display_color_manager_; | 592 std::unique_ptr<DisplayColorManager> display_color_manager_; |
588 std::unique_ptr<DisplayErrorObserver> display_error_observer_; | 593 std::unique_ptr<DisplayErrorObserver> display_error_observer_; |
589 std::unique_ptr<ProjectingObserver> projecting_observer_; | 594 std::unique_ptr<ProjectingObserver> projecting_observer_; |
590 | 595 |
591 // Listens for output changes and updates the display manager. | 596 // Listens for output changes and updates the display manager. |
592 std::unique_ptr<DisplayChangeObserver> display_change_observer_; | 597 std::unique_ptr<DisplayChangeObserver> display_change_observer_; |
593 | 598 |
594 // Implements content::ScreenOrientationController for ChromeOS | 599 // Implements content::ScreenOrientationController for ChromeOS |
595 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; | 600 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; |
| 601 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; |
596 | 602 |
597 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; | 603 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; |
598 | 604 |
599 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; | 605 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; |
600 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; | 606 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; |
601 #endif // defined(OS_CHROMEOS) | 607 #endif // defined(OS_CHROMEOS) |
602 | 608 |
603 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a | 609 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a |
604 // pointer to vend to test code. | 610 // pointer to vend to test code. |
605 AshNativeCursorManager* native_cursor_manager_; | 611 AshNativeCursorManager* native_cursor_manager_; |
(...skipping 13 matching lines...) Expand all Loading... |
619 base::SequencedWorkerPool* blocking_pool_; | 625 base::SequencedWorkerPool* blocking_pool_; |
620 | 626 |
621 bool in_mus_ = false; | 627 bool in_mus_ = false; |
622 | 628 |
623 DISALLOW_COPY_AND_ASSIGN(Shell); | 629 DISALLOW_COPY_AND_ASSIGN(Shell); |
624 }; | 630 }; |
625 | 631 |
626 } // namespace ash | 632 } // namespace ash |
627 | 633 |
628 #endif // ASH_SHELL_H_ | 634 #endif // ASH_SHELL_H_ |
OLD | NEW |