| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 class ToplevelWindowEventHandler; | 152 class ToplevelWindowEventHandler; |
| 153 class TouchTransformerController; | 153 class TouchTransformerController; |
| 154 class TouchObserverHUD; | 154 class TouchObserverHUD; |
| 155 class UserWallpaperDelegate; | 155 class UserWallpaperDelegate; |
| 156 class VirtualKeyboardController; | 156 class VirtualKeyboardController; |
| 157 class VideoActivityNotifier; | 157 class VideoActivityNotifier; |
| 158 class VideoDetector; | 158 class VideoDetector; |
| 159 class WebNotificationTray; | 159 class WebNotificationTray; |
| 160 class WindowCycleController; | 160 class WindowCycleController; |
| 161 class WindowPositioner; | 161 class WindowPositioner; |
| 162 class WindowSelectorController; | |
| 163 class WmShellAura; | 162 class WmShellAura; |
| 164 class WmWindow; | 163 class WmWindow; |
| 165 | 164 |
| 166 namespace shell { | 165 namespace shell { |
| 167 class WindowWatcher; | 166 class WindowWatcher; |
| 168 } | 167 } |
| 169 | 168 |
| 170 namespace test { | 169 namespace test { |
| 171 class ShellTestApi; | 170 class ShellTestApi; |
| 172 } | 171 } |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 } | 357 } |
| 359 MruWindowTracker* mru_window_tracker() { | 358 MruWindowTracker* mru_window_tracker() { |
| 360 return wm_shell_common_->mru_window_tracker(); | 359 return wm_shell_common_->mru_window_tracker(); |
| 361 } | 360 } |
| 362 VideoDetector* video_detector() { | 361 VideoDetector* video_detector() { |
| 363 return video_detector_.get(); | 362 return video_detector_.get(); |
| 364 } | 363 } |
| 365 WindowCycleController* window_cycle_controller() { | 364 WindowCycleController* window_cycle_controller() { |
| 366 return window_cycle_controller_.get(); | 365 return window_cycle_controller_.get(); |
| 367 } | 366 } |
| 368 WindowSelectorController* window_selector_controller() { | |
| 369 return window_selector_controller_.get(); | |
| 370 } | |
| 371 WindowTreeHostManager* window_tree_host_manager() { | 367 WindowTreeHostManager* window_tree_host_manager() { |
| 372 return window_tree_host_manager_.get(); | 368 return window_tree_host_manager_.get(); |
| 373 } | 369 } |
| 374 #if defined(OS_CHROMEOS) | 370 #if defined(OS_CHROMEOS) |
| 375 PowerEventObserver* power_event_observer() { | 371 PowerEventObserver* power_event_observer() { |
| 376 return power_event_observer_.get(); | 372 return power_event_observer_.get(); |
| 377 } | 373 } |
| 378 TouchTransformerController* touch_transformer_controller() { | 374 TouchTransformerController* touch_transformer_controller() { |
| 379 return touch_transformer_controller_.get(); | 375 return touch_transformer_controller_.get(); |
| 380 } | 376 } |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 std::unique_ptr<::wm::VisibilityController> visibility_controller_; | 662 std::unique_ptr<::wm::VisibilityController> visibility_controller_; |
| 667 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; | 663 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; |
| 668 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; | 664 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; |
| 669 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; | 665 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; |
| 670 LinkHandlerModelFactory* link_handler_model_factory_; | 666 LinkHandlerModelFactory* link_handler_model_factory_; |
| 671 std::unique_ptr<PowerButtonController> power_button_controller_; | 667 std::unique_ptr<PowerButtonController> power_button_controller_; |
| 672 std::unique_ptr<LockStateController> lock_state_controller_; | 668 std::unique_ptr<LockStateController> lock_state_controller_; |
| 673 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; | 669 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; |
| 674 std::unique_ptr<VideoDetector> video_detector_; | 670 std::unique_ptr<VideoDetector> video_detector_; |
| 675 std::unique_ptr<WindowCycleController> window_cycle_controller_; | 671 std::unique_ptr<WindowCycleController> window_cycle_controller_; |
| 676 std::unique_ptr<WindowSelectorController> window_selector_controller_; | |
| 677 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; | 672 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; |
| 678 std::unique_ptr<HighContrastController> high_contrast_controller_; | 673 std::unique_ptr<HighContrastController> high_contrast_controller_; |
| 679 std::unique_ptr<MagnificationController> magnification_controller_; | 674 std::unique_ptr<MagnificationController> magnification_controller_; |
| 680 std::unique_ptr<PartialMagnificationController> | 675 std::unique_ptr<PartialMagnificationController> |
| 681 partial_magnification_controller_; | 676 partial_magnification_controller_; |
| 682 std::unique_ptr<AutoclickController> autoclick_controller_; | 677 std::unique_ptr<AutoclickController> autoclick_controller_; |
| 683 std::unique_ptr<aura::client::FocusClient> focus_client_; | 678 std::unique_ptr<aura::client::FocusClient> focus_client_; |
| 684 | 679 |
| 685 aura::client::ActivationClient* activation_client_; | 680 aura::client::ActivationClient* activation_client_; |
| 686 | 681 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 bool in_mus_ = false; | 766 bool in_mus_ = false; |
| 772 | 767 |
| 773 std::unique_ptr<KeyboardUI> keyboard_ui_; | 768 std::unique_ptr<KeyboardUI> keyboard_ui_; |
| 774 | 769 |
| 775 DISALLOW_COPY_AND_ASSIGN(Shell); | 770 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 776 }; | 771 }; |
| 777 | 772 |
| 778 } // namespace ash | 773 } // namespace ash |
| 779 | 774 |
| 780 #endif // ASH_SHELL_H_ | 775 #endif // ASH_SHELL_H_ |
| OLD | NEW |