| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 class DisplayManager; | 57 class DisplayManager; |
| 58 } | 58 } |
| 59 | 59 |
| 60 namespace gfx { | 60 namespace gfx { |
| 61 class Insets; | 61 class Insets; |
| 62 } | 62 } |
| 63 | 63 |
| 64 namespace ui { | 64 namespace ui { |
| 65 class UserActivityDetector; | 65 class UserActivityDetector; |
| 66 class UserActivityPowerManagerNotifier; | 66 class UserActivityPowerManagerNotifier; |
| 67 namespace devtools { | 67 } |
| 68 |
| 69 namespace ui_devtools { |
| 68 class UiDevToolsServer; | 70 class UiDevToolsServer; |
| 69 } | 71 } |
| 70 } | |
| 71 | 72 |
| 72 namespace views { | 73 namespace views { |
| 73 class NonClientFrameView; | 74 class NonClientFrameView; |
| 74 class Widget; | 75 class Widget; |
| 75 namespace corewm { | 76 namespace corewm { |
| 76 class TooltipController; | 77 class TooltipController; |
| 77 } | 78 } |
| 78 } | 79 } |
| 79 | 80 |
| 80 namespace wm { | 81 namespace wm { |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 std::unique_ptr<VpnList> vpn_list_; | 720 std::unique_ptr<VpnList> vpn_list_; |
| 720 std::unique_ptr<WallpaperController> wallpaper_controller_; | 721 std::unique_ptr<WallpaperController> wallpaper_controller_; |
| 721 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; | 722 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; |
| 722 std::unique_ptr<WindowCycleController> window_cycle_controller_; | 723 std::unique_ptr<WindowCycleController> window_cycle_controller_; |
| 723 std::unique_ptr<WindowSelectorController> window_selector_controller_; | 724 std::unique_ptr<WindowSelectorController> window_selector_controller_; |
| 724 std::unique_ptr<::wm::ShadowController> shadow_controller_; | 725 std::unique_ptr<::wm::ShadowController> shadow_controller_; |
| 725 std::unique_ptr<::wm::VisibilityController> visibility_controller_; | 726 std::unique_ptr<::wm::VisibilityController> visibility_controller_; |
| 726 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; | 727 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; |
| 727 std::unique_ptr<app_list::AppList> app_list_; | 728 std::unique_ptr<app_list::AppList> app_list_; |
| 728 std::unique_ptr<::PrefService> pref_service_; | 729 std::unique_ptr<::PrefService> pref_service_; |
| 729 std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_; | 730 std::unique_ptr<ui_devtools::UiDevToolsServer> devtools_server_; |
| 730 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; | 731 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; |
| 731 LinkHandlerModelFactory* link_handler_model_factory_; | 732 LinkHandlerModelFactory* link_handler_model_factory_; |
| 732 std::unique_ptr<PowerButtonController> power_button_controller_; | 733 std::unique_ptr<PowerButtonController> power_button_controller_; |
| 733 std::unique_ptr<LockStateController> lock_state_controller_; | 734 std::unique_ptr<LockStateController> lock_state_controller_; |
| 734 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; | 735 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; |
| 735 std::unique_ptr<VideoDetector> video_detector_; | 736 std::unique_ptr<VideoDetector> video_detector_; |
| 736 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; | 737 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; |
| 737 std::unique_ptr<HighContrastController> high_contrast_controller_; | 738 std::unique_ptr<HighContrastController> high_contrast_controller_; |
| 738 std::unique_ptr<MagnificationController> magnification_controller_; | 739 std::unique_ptr<MagnificationController> magnification_controller_; |
| 739 std::unique_ptr<AutoclickController> autoclick_controller_; | 740 std::unique_ptr<AutoclickController> autoclick_controller_; |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 835 base::ObserverList<ShellObserver> shell_observers_; | 836 base::ObserverList<ShellObserver> shell_observers_; |
| 836 | 837 |
| 837 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 838 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 838 | 839 |
| 839 DISALLOW_COPY_AND_ASSIGN(Shell); | 840 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 840 }; | 841 }; |
| 841 | 842 |
| 842 } // namespace ash | 843 } // namespace ash |
| 843 | 844 |
| 844 #endif // ASH_SHELL_H_ | 845 #endif // ASH_SHELL_H_ |
| OLD | NEW |