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 <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 namespace ash { | 78 namespace ash { |
79 | 79 |
80 class AcceleratorController; | 80 class AcceleratorController; |
81 class AccessibilityDelegate; | 81 class AccessibilityDelegate; |
82 class AppListController; | 82 class AppListController; |
83 class AshNativeCursorManager; | 83 class AshNativeCursorManager; |
84 class AutoclickController; | 84 class AutoclickController; |
85 class BluetoothNotificationController; | 85 class BluetoothNotificationController; |
86 class CaptureController; | 86 class CaptureController; |
87 class DesktopBackgroundController; | 87 class DesktopBackgroundController; |
88 class DisplayAnimator; | |
89 class DisplayChangeObserver; | 88 class DisplayChangeObserver; |
90 class DisplayColorManager; | 89 class DisplayColorManager; |
| 90 class DisplayConfigurationController; |
91 class WindowTreeHostManager; | 91 class WindowTreeHostManager; |
92 class DisplayErrorObserver; | 92 class DisplayErrorObserver; |
93 class DisplayManager; | 93 class DisplayManager; |
94 class DragDropController; | 94 class DragDropController; |
95 class EventClientImpl; | 95 class EventClientImpl; |
96 class EventRewriterEventFilter; | 96 class EventRewriterEventFilter; |
97 class EventTransformationHandler; | 97 class EventTransformationHandler; |
98 class FirstRunHelper; | 98 class FirstRunHelper; |
99 class FocusCycler; | 99 class FocusCycler; |
100 class GPUSupport; | 100 class GPUSupport; |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 | 516 |
517 MaximizeModeController* maximize_mode_controller() { | 517 MaximizeModeController* maximize_mode_controller() { |
518 return maximize_mode_controller_.get(); | 518 return maximize_mode_controller_.get(); |
519 } | 519 } |
520 | 520 |
521 #if defined(OS_CHROMEOS) | 521 #if defined(OS_CHROMEOS) |
522 // TODO(oshima): Move these objects to WindowTreeHostManager. | 522 // TODO(oshima): Move these objects to WindowTreeHostManager. |
523 ui::DisplayConfigurator* display_configurator() { | 523 ui::DisplayConfigurator* display_configurator() { |
524 return display_configurator_.get(); | 524 return display_configurator_.get(); |
525 } | 525 } |
526 DisplayAnimator* display_animator() { return display_animator_.get(); } | 526 DisplayConfigurationController* display_configuration_controller() { |
| 527 return display_configuration_controller_.get(); |
| 528 } |
527 DisplayErrorObserver* display_error_observer() { | 529 DisplayErrorObserver* display_error_observer() { |
528 return display_error_observer_.get(); | 530 return display_error_observer_.get(); |
529 } | 531 } |
530 | 532 |
531 ResolutionNotificationController* resolution_notification_controller() { | 533 ResolutionNotificationController* resolution_notification_controller() { |
532 return resolution_notification_controller_.get(); | 534 return resolution_notification_controller_.get(); |
533 } | 535 } |
534 | 536 |
535 LogoutConfirmationController* logout_confirmation_controller() { | 537 LogoutConfirmationController* logout_confirmation_controller() { |
536 return logout_confirmation_controller_.get(); | 538 return logout_confirmation_controller_.get(); |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
717 resolution_notification_controller_; | 719 resolution_notification_controller_; |
718 scoped_ptr<BluetoothNotificationController> | 720 scoped_ptr<BluetoothNotificationController> |
719 bluetooth_notification_controller_; | 721 bluetooth_notification_controller_; |
720 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 722 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
721 scoped_ptr<LastWindowClosedLogoutReminder> | 723 scoped_ptr<LastWindowClosedLogoutReminder> |
722 last_window_closed_logout_reminder_; | 724 last_window_closed_logout_reminder_; |
723 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_; | 725 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_; |
724 // Controls video output device state. | 726 // Controls video output device state. |
725 scoped_ptr<ui::DisplayConfigurator> display_configurator_; | 727 scoped_ptr<ui::DisplayConfigurator> display_configurator_; |
726 scoped_ptr<DisplayColorManager> display_color_manager_; | 728 scoped_ptr<DisplayColorManager> display_color_manager_; |
727 scoped_ptr<DisplayAnimator> display_animator_; | 729 scoped_ptr<DisplayConfigurationController> display_configuration_controller_; |
728 scoped_ptr<DisplayErrorObserver> display_error_observer_; | 730 scoped_ptr<DisplayErrorObserver> display_error_observer_; |
729 scoped_ptr<ProjectingObserver> projecting_observer_; | 731 scoped_ptr<ProjectingObserver> projecting_observer_; |
730 | 732 |
731 // Listens for output changes and updates the display manager. | 733 // Listens for output changes and updates the display manager. |
732 scoped_ptr<DisplayChangeObserver> display_change_observer_; | 734 scoped_ptr<DisplayChangeObserver> display_change_observer_; |
733 | 735 |
734 // Implements content::ScreenOrientationController for ChromeOS | 736 // Implements content::ScreenOrientationController for ChromeOS |
735 scoped_ptr<ScreenOrientationController> screen_orientation_controller_; | 737 scoped_ptr<ScreenOrientationController> screen_orientation_controller_; |
736 | 738 |
737 scoped_ptr<TouchTransformerController> touch_transformer_controller_; | 739 scoped_ptr<TouchTransformerController> touch_transformer_controller_; |
(...skipping 27 matching lines...) Expand all Loading... |
765 scoped_ptr<GPUSupport> gpu_support_; | 767 scoped_ptr<GPUSupport> gpu_support_; |
766 | 768 |
767 base::SequencedWorkerPool* blocking_pool_; | 769 base::SequencedWorkerPool* blocking_pool_; |
768 | 770 |
769 DISALLOW_COPY_AND_ASSIGN(Shell); | 771 DISALLOW_COPY_AND_ASSIGN(Shell); |
770 }; | 772 }; |
771 | 773 |
772 } // namespace ash | 774 } // namespace ash |
773 | 775 |
774 #endif // ASH_SHELL_H_ | 776 #endif // ASH_SHELL_H_ |
OLD | NEW |