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 28 matching lines...) Expand all Loading... |
39 namespace client { | 39 namespace client { |
40 class ActivationClient; | 40 class ActivationClient; |
41 class FocusClient; | 41 class FocusClient; |
42 } | 42 } |
43 } | 43 } |
44 | 44 |
45 namespace base { | 45 namespace base { |
46 class SequencedWorkerPool; | 46 class SequencedWorkerPool; |
47 } | 47 } |
48 | 48 |
| 49 namespace chromeos { |
| 50 class AudioA11yController; |
| 51 } |
| 52 |
49 namespace gfx { | 53 namespace gfx { |
50 class ImageSkia; | 54 class ImageSkia; |
51 class Point; | 55 class Point; |
52 class Rect; | 56 class Rect; |
53 } | 57 } |
54 | 58 |
55 namespace ui { | 59 namespace ui { |
56 class DisplayConfigurator; | 60 class DisplayConfigurator; |
57 class Layer; | 61 class Layer; |
58 class UserActivityDetector; | 62 class UserActivityDetector; |
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 return logout_confirmation_controller_.get(); | 545 return logout_confirmation_controller_.get(); |
542 } | 546 } |
543 | 547 |
544 ScreenOrientationController* screen_orientation_controller() { | 548 ScreenOrientationController* screen_orientation_controller() { |
545 return screen_orientation_controller_.get(); | 549 return screen_orientation_controller_.get(); |
546 } | 550 } |
547 | 551 |
548 VirtualKeyboardController* virtual_keyboard_controller() { | 552 VirtualKeyboardController* virtual_keyboard_controller() { |
549 return virtual_keyboard_controller_.get(); | 553 return virtual_keyboard_controller_.get(); |
550 } | 554 } |
| 555 |
| 556 chromeos::AudioA11yController* audio_a11y_controller() { |
| 557 return audio_a11y_controller_.get(); |
| 558 } |
551 #endif // defined(OS_CHROMEOS) | 559 #endif // defined(OS_CHROMEOS) |
552 | 560 |
553 ShelfModel* shelf_model() { | 561 ShelfModel* shelf_model() { |
554 return shelf_model_.get(); | 562 return shelf_model_.get(); |
555 } | 563 } |
556 | 564 |
557 WindowPositioner* window_positioner() { | 565 WindowPositioner* window_positioner() { |
558 return window_positioner_.get(); | 566 return window_positioner_.get(); |
559 } | 567 } |
560 | 568 |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
730 std::unique_ptr<VideoActivityNotifier> video_activity_notifier_; | 738 std::unique_ptr<VideoActivityNotifier> video_activity_notifier_; |
731 std::unique_ptr<StickyKeysController> sticky_keys_controller_; | 739 std::unique_ptr<StickyKeysController> sticky_keys_controller_; |
732 std::unique_ptr<ResolutionNotificationController> | 740 std::unique_ptr<ResolutionNotificationController> |
733 resolution_notification_controller_; | 741 resolution_notification_controller_; |
734 std::unique_ptr<BluetoothNotificationController> | 742 std::unique_ptr<BluetoothNotificationController> |
735 bluetooth_notification_controller_; | 743 bluetooth_notification_controller_; |
736 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 744 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
737 std::unique_ptr<LastWindowClosedLogoutReminder> | 745 std::unique_ptr<LastWindowClosedLogoutReminder> |
738 last_window_closed_logout_reminder_; | 746 last_window_closed_logout_reminder_; |
739 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_; | 747 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_; |
| 748 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_; |
740 // Controls video output device state. | 749 // Controls video output device state. |
741 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; | 750 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; |
742 std::unique_ptr<DisplayColorManager> display_color_manager_; | 751 std::unique_ptr<DisplayColorManager> display_color_manager_; |
743 std::unique_ptr<DisplayErrorObserver> display_error_observer_; | 752 std::unique_ptr<DisplayErrorObserver> display_error_observer_; |
744 std::unique_ptr<ProjectingObserver> projecting_observer_; | 753 std::unique_ptr<ProjectingObserver> projecting_observer_; |
745 | 754 |
746 // Listens for output changes and updates the display manager. | 755 // Listens for output changes and updates the display manager. |
747 std::unique_ptr<DisplayChangeObserver> display_change_observer_; | 756 std::unique_ptr<DisplayChangeObserver> display_change_observer_; |
748 | 757 |
749 // Implements content::ScreenOrientationController for ChromeOS | 758 // Implements content::ScreenOrientationController for ChromeOS |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
781 bool in_mus_ = false; | 790 bool in_mus_ = false; |
782 | 791 |
783 std::unique_ptr<KeyboardUI> keyboard_ui_; | 792 std::unique_ptr<KeyboardUI> keyboard_ui_; |
784 | 793 |
785 DISALLOW_COPY_AND_ASSIGN(Shell); | 794 DISALLOW_COPY_AND_ASSIGN(Shell); |
786 }; | 795 }; |
787 | 796 |
788 } // namespace ash | 797 } // namespace ash |
789 | 798 |
790 #endif // ASH_SHELL_H_ | 799 #endif // ASH_SHELL_H_ |
OLD | NEW |