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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 } | 356 } |
357 MruWindowTracker* mru_window_tracker() { | 357 MruWindowTracker* mru_window_tracker() { |
358 return mru_window_tracker_.get(); | 358 return mru_window_tracker_.get(); |
359 } | 359 } |
360 ::wm::UserActivityDetector* user_activity_detector() { | 360 ::wm::UserActivityDetector* user_activity_detector() { |
361 return user_activity_detector_.get(); | 361 return user_activity_detector_.get(); |
362 } | 362 } |
363 VideoDetector* video_detector() { | 363 VideoDetector* video_detector() { |
364 return video_detector_.get(); | 364 return video_detector_.get(); |
365 } | 365 } |
| 366 WindowCycleController* window_cycle_controller() { |
| 367 return window_cycle_controller_.get(); |
| 368 } |
366 WindowSelectorController* window_selector_controller() { | 369 WindowSelectorController* window_selector_controller() { |
367 return window_selector_controller_.get(); | 370 return window_selector_controller_.get(); |
368 } | 371 } |
369 FocusCycler* focus_cycler() { return focus_cycler_.get(); } | 372 FocusCycler* focus_cycler() { return focus_cycler_.get(); } |
370 DisplayController* display_controller() { | 373 DisplayController* display_controller() { |
371 return display_controller_.get(); | 374 return display_controller_.get(); |
372 } | 375 } |
373 MouseCursorEventFilter* mouse_cursor_filter() { | 376 MouseCursorEventFilter* mouse_cursor_filter() { |
374 return mouse_cursor_filter_.get(); | 377 return mouse_cursor_filter_.get(); |
375 } | 378 } |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 scoped_ptr< ::wm::ShadowController> shadow_controller_; | 640 scoped_ptr< ::wm::ShadowController> shadow_controller_; |
638 scoped_ptr< ::wm::VisibilityController> visibility_controller_; | 641 scoped_ptr< ::wm::VisibilityController> visibility_controller_; |
639 scoped_ptr< ::wm::WindowModalityController> window_modality_controller_; | 642 scoped_ptr< ::wm::WindowModalityController> window_modality_controller_; |
640 scoped_ptr<views::corewm::TooltipController> tooltip_controller_; | 643 scoped_ptr<views::corewm::TooltipController> tooltip_controller_; |
641 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; | 644 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; |
642 scoped_ptr<PowerButtonController> power_button_controller_; | 645 scoped_ptr<PowerButtonController> power_button_controller_; |
643 scoped_ptr<LockStateController> lock_state_controller_; | 646 scoped_ptr<LockStateController> lock_state_controller_; |
644 scoped_ptr<MruWindowTracker> mru_window_tracker_; | 647 scoped_ptr<MruWindowTracker> mru_window_tracker_; |
645 scoped_ptr< ::wm::UserActivityDetector> user_activity_detector_; | 648 scoped_ptr< ::wm::UserActivityDetector> user_activity_detector_; |
646 scoped_ptr<VideoDetector> video_detector_; | 649 scoped_ptr<VideoDetector> video_detector_; |
| 650 scoped_ptr<WindowCycleController> window_cycle_controller_; |
647 scoped_ptr<WindowSelectorController> window_selector_controller_; | 651 scoped_ptr<WindowSelectorController> window_selector_controller_; |
648 scoped_ptr<FocusCycler> focus_cycler_; | 652 scoped_ptr<FocusCycler> focus_cycler_; |
649 scoped_ptr<DisplayController> display_controller_; | 653 scoped_ptr<DisplayController> display_controller_; |
650 scoped_ptr<HighContrastController> high_contrast_controller_; | 654 scoped_ptr<HighContrastController> high_contrast_controller_; |
651 scoped_ptr<MagnificationController> magnification_controller_; | 655 scoped_ptr<MagnificationController> magnification_controller_; |
652 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; | 656 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; |
653 scoped_ptr<AutoclickController> autoclick_controller_; | 657 scoped_ptr<AutoclickController> autoclick_controller_; |
654 scoped_ptr<aura::client::FocusClient> focus_client_; | 658 scoped_ptr<aura::client::FocusClient> focus_client_; |
655 aura::client::ActivationClient* activation_client_; | 659 aura::client::ActivationClient* activation_client_; |
656 | 660 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
740 | 744 |
741 // Injected content::GPUDataManager support. | 745 // Injected content::GPUDataManager support. |
742 scoped_ptr<GPUSupport> gpu_support_; | 746 scoped_ptr<GPUSupport> gpu_support_; |
743 | 747 |
744 DISALLOW_COPY_AND_ASSIGN(Shell); | 748 DISALLOW_COPY_AND_ASSIGN(Shell); |
745 }; | 749 }; |
746 | 750 |
747 } // namespace ash | 751 } // namespace ash |
748 | 752 |
749 #endif // ASH_SHELL_H_ | 753 #endif // ASH_SHELL_H_ |
OLD | NEW |