| 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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 } | 363 } |
| 364 MruWindowTracker* mru_window_tracker() { | 364 MruWindowTracker* mru_window_tracker() { |
| 365 return mru_window_tracker_.get(); | 365 return mru_window_tracker_.get(); |
| 366 } | 366 } |
| 367 UserActivityDetector* user_activity_detector() { | 367 UserActivityDetector* user_activity_detector() { |
| 368 return user_activity_detector_.get(); | 368 return user_activity_detector_.get(); |
| 369 } | 369 } |
| 370 VideoDetector* video_detector() { | 370 VideoDetector* video_detector() { |
| 371 return video_detector_.get(); | 371 return video_detector_.get(); |
| 372 } | 372 } |
| 373 WindowCycleController* window_cycle_controller() { | |
| 374 return window_cycle_controller_.get(); | |
| 375 } | |
| 376 WindowSelectorController* window_selector_controller() { | 373 WindowSelectorController* window_selector_controller() { |
| 377 return window_selector_controller_.get(); | 374 return window_selector_controller_.get(); |
| 378 } | 375 } |
| 379 internal::FocusCycler* focus_cycler() { | 376 internal::FocusCycler* focus_cycler() { |
| 380 return focus_cycler_.get(); | 377 return focus_cycler_.get(); |
| 381 } | 378 } |
| 382 DisplayController* display_controller() { | 379 DisplayController* display_controller() { |
| 383 return display_controller_.get(); | 380 return display_controller_.get(); |
| 384 } | 381 } |
| 385 internal::MouseCursorEventFilter* mouse_cursor_filter() { | 382 internal::MouseCursorEventFilter* mouse_cursor_filter() { |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; | 647 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; |
| 651 scoped_ptr<views::corewm::WindowModalityController> | 648 scoped_ptr<views::corewm::WindowModalityController> |
| 652 window_modality_controller_; | 649 window_modality_controller_; |
| 653 scoped_ptr<views::corewm::TooltipController> tooltip_controller_; | 650 scoped_ptr<views::corewm::TooltipController> tooltip_controller_; |
| 654 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; | 651 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; |
| 655 scoped_ptr<PowerButtonController> power_button_controller_; | 652 scoped_ptr<PowerButtonController> power_button_controller_; |
| 656 scoped_ptr<LockStateController> lock_state_controller_; | 653 scoped_ptr<LockStateController> lock_state_controller_; |
| 657 scoped_ptr<MruWindowTracker> mru_window_tracker_; | 654 scoped_ptr<MruWindowTracker> mru_window_tracker_; |
| 658 scoped_ptr<UserActivityDetector> user_activity_detector_; | 655 scoped_ptr<UserActivityDetector> user_activity_detector_; |
| 659 scoped_ptr<VideoDetector> video_detector_; | 656 scoped_ptr<VideoDetector> video_detector_; |
| 660 scoped_ptr<WindowCycleController> window_cycle_controller_; | |
| 661 scoped_ptr<WindowSelectorController> window_selector_controller_; | 657 scoped_ptr<WindowSelectorController> window_selector_controller_; |
| 662 scoped_ptr<internal::FocusCycler> focus_cycler_; | 658 scoped_ptr<internal::FocusCycler> focus_cycler_; |
| 663 scoped_ptr<DisplayController> display_controller_; | 659 scoped_ptr<DisplayController> display_controller_; |
| 664 scoped_ptr<HighContrastController> high_contrast_controller_; | 660 scoped_ptr<HighContrastController> high_contrast_controller_; |
| 665 scoped_ptr<MagnificationController> magnification_controller_; | 661 scoped_ptr<MagnificationController> magnification_controller_; |
| 666 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; | 662 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; |
| 667 scoped_ptr<AutoclickController> autoclick_controller_; | 663 scoped_ptr<AutoclickController> autoclick_controller_; |
| 668 scoped_ptr<aura::client::FocusClient> focus_client_; | 664 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 669 aura::client::ActivationClient* activation_client_; | 665 aura::client::ActivationClient* activation_client_; |
| 670 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; | 666 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 745 | 741 |
| 746 // Injected content::GPUDataManager support. | 742 // Injected content::GPUDataManager support. |
| 747 scoped_ptr<GPUSupport> gpu_support_; | 743 scoped_ptr<GPUSupport> gpu_support_; |
| 748 | 744 |
| 749 DISALLOW_COPY_AND_ASSIGN(Shell); | 745 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 750 }; | 746 }; |
| 751 | 747 |
| 752 } // namespace ash | 748 } // namespace ash |
| 753 | 749 |
| 754 #endif // ASH_SHELL_H_ | 750 #endif // ASH_SHELL_H_ |
| OLD | NEW |