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 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 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 return logout_confirmation_controller_.get(); | 542 return logout_confirmation_controller_.get(); |
539 } | 543 } |
540 | 544 |
541 ScreenOrientationController* screen_orientation_controller() { | 545 ScreenOrientationController* screen_orientation_controller() { |
542 return screen_orientation_controller_.get(); | 546 return screen_orientation_controller_.get(); |
543 } | 547 } |
544 | 548 |
545 VirtualKeyboardController* virtual_keyboard_controller() { | 549 VirtualKeyboardController* virtual_keyboard_controller() { |
546 return virtual_keyboard_controller_.get(); | 550 return virtual_keyboard_controller_.get(); |
547 } | 551 } |
| 552 |
| 553 chromeos::AudioA11yController* audio_a11y_controller() { |
| 554 return audio_a11y_controller_.get(); |
| 555 } |
548 #endif // defined(OS_CHROMEOS) | 556 #endif // defined(OS_CHROMEOS) |
549 | 557 |
550 ShelfModel* shelf_model() { | 558 ShelfModel* shelf_model() { |
551 return shelf_model_.get(); | 559 return shelf_model_.get(); |
552 } | 560 } |
553 | 561 |
554 WindowPositioner* window_positioner() { | 562 WindowPositioner* window_positioner() { |
555 return window_positioner_.get(); | 563 return window_positioner_.get(); |
556 } | 564 } |
557 | 565 |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
725 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; | 733 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; |
726 scoped_ptr<StickyKeysController> sticky_keys_controller_; | 734 scoped_ptr<StickyKeysController> sticky_keys_controller_; |
727 scoped_ptr<ResolutionNotificationController> | 735 scoped_ptr<ResolutionNotificationController> |
728 resolution_notification_controller_; | 736 resolution_notification_controller_; |
729 scoped_ptr<BluetoothNotificationController> | 737 scoped_ptr<BluetoothNotificationController> |
730 bluetooth_notification_controller_; | 738 bluetooth_notification_controller_; |
731 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 739 scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
732 scoped_ptr<LastWindowClosedLogoutReminder> | 740 scoped_ptr<LastWindowClosedLogoutReminder> |
733 last_window_closed_logout_reminder_; | 741 last_window_closed_logout_reminder_; |
734 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_; | 742 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_; |
| 743 scoped_ptr<chromeos::AudioA11yController> audio_a11y_controller_; |
735 // Controls video output device state. | 744 // Controls video output device state. |
736 scoped_ptr<ui::DisplayConfigurator> display_configurator_; | 745 scoped_ptr<ui::DisplayConfigurator> display_configurator_; |
737 scoped_ptr<DisplayColorManager> display_color_manager_; | 746 scoped_ptr<DisplayColorManager> display_color_manager_; |
738 scoped_ptr<DisplayErrorObserver> display_error_observer_; | 747 scoped_ptr<DisplayErrorObserver> display_error_observer_; |
739 scoped_ptr<ProjectingObserver> projecting_observer_; | 748 scoped_ptr<ProjectingObserver> projecting_observer_; |
740 | 749 |
741 // Listens for output changes and updates the display manager. | 750 // Listens for output changes and updates the display manager. |
742 scoped_ptr<DisplayChangeObserver> display_change_observer_; | 751 scoped_ptr<DisplayChangeObserver> display_change_observer_; |
743 | 752 |
744 // Implements content::ScreenOrientationController for ChromeOS | 753 // Implements content::ScreenOrientationController for ChromeOS |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
776 bool in_mus_ = false; | 785 bool in_mus_ = false; |
777 | 786 |
778 scoped_ptr<KeyboardUI> keyboard_ui_; | 787 scoped_ptr<KeyboardUI> keyboard_ui_; |
779 | 788 |
780 DISALLOW_COPY_AND_ASSIGN(Shell); | 789 DISALLOW_COPY_AND_ASSIGN(Shell); |
781 }; | 790 }; |
782 | 791 |
783 } // namespace ash | 792 } // namespace ash |
784 | 793 |
785 #endif // ASH_SHELL_H_ | 794 #endif // ASH_SHELL_H_ |
OLD | NEW |