| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_COMMON_WM_SHELL_H_ | 5 #ifndef ASH_COMMON_WM_SHELL_H_ |
| 6 #define ASH_COMMON_WM_SHELL_H_ | 6 #define ASH_COMMON_WM_SHELL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 class AcceleratorController; | 25 class AcceleratorController; |
| 26 class AccessibilityDelegate; | 26 class AccessibilityDelegate; |
| 27 class BrightnessControlDelegate; | 27 class BrightnessControlDelegate; |
| 28 class DisplayInfo; | 28 class DisplayInfo; |
| 29 class FocusCycler; | 29 class FocusCycler; |
| 30 class KeyboardBrightnessControlDelegate; | 30 class KeyboardBrightnessControlDelegate; |
| 31 class KeyboardUI; | 31 class KeyboardUI; |
| 32 class MaximizeModeController; | 32 class MaximizeModeController; |
| 33 class MruWindowTracker; | 33 class MruWindowTracker; |
| 34 class NewWindowDelegate; |
| 34 class ScopedDisableInternalMouseAndKeyboard; | 35 class ScopedDisableInternalMouseAndKeyboard; |
| 35 class SessionStateDelegate; | 36 class SessionStateDelegate; |
| 36 class ShelfDelegate; | 37 class ShelfDelegate; |
| 37 class ShelfModel; | 38 class ShelfModel; |
| 38 class ShellDelegate; | 39 class ShellDelegate; |
| 39 class ShellObserver; | 40 class ShellObserver; |
| 40 class SystemTrayDelegate; | 41 class SystemTrayDelegate; |
| 41 class SystemTrayNotifier; | 42 class SystemTrayNotifier; |
| 42 class ToastManager; | 43 class ToastManager; |
| 43 class WindowCycleController; | 44 class WindowCycleController; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } | 95 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } |
| 95 | 96 |
| 96 MaximizeModeController* maximize_mode_controller() { | 97 MaximizeModeController* maximize_mode_controller() { |
| 97 return maximize_mode_controller_.get(); | 98 return maximize_mode_controller_.get(); |
| 98 } | 99 } |
| 99 | 100 |
| 100 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } | 101 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } |
| 101 | 102 |
| 102 MediaDelegate* media_delegate() { return media_delegate_.get(); } | 103 MediaDelegate* media_delegate() { return media_delegate_.get(); } |
| 103 | 104 |
| 105 NewWindowDelegate* new_window_delegate() { |
| 106 return new_window_delegate_.get(); |
| 107 } |
| 108 |
| 104 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } | 109 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } |
| 105 | 110 |
| 106 ShelfModel* shelf_model() { return shelf_model_.get(); } | 111 ShelfModel* shelf_model() { return shelf_model_.get(); } |
| 107 | 112 |
| 108 SystemTrayNotifier* system_tray_notifier() { | 113 SystemTrayNotifier* system_tray_notifier() { |
| 109 return system_tray_notifier_.get(); | 114 return system_tray_notifier_.get(); |
| 110 } | 115 } |
| 111 | 116 |
| 112 SystemTrayDelegate* system_tray_delegate() { | 117 SystemTrayDelegate* system_tray_delegate() { |
| 113 return system_tray_delegate_.get(); | 118 return system_tray_delegate_.get(); |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 std::unique_ptr<AcceleratorController> accelerator_controller_; | 321 std::unique_ptr<AcceleratorController> accelerator_controller_; |
| 317 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; | 322 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; |
| 318 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; | 323 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; |
| 319 std::unique_ptr<FocusCycler> focus_cycler_; | 324 std::unique_ptr<FocusCycler> focus_cycler_; |
| 320 std::unique_ptr<KeyboardBrightnessControlDelegate> | 325 std::unique_ptr<KeyboardBrightnessControlDelegate> |
| 321 keyboard_brightness_control_delegate_; | 326 keyboard_brightness_control_delegate_; |
| 322 std::unique_ptr<KeyboardUI> keyboard_ui_; | 327 std::unique_ptr<KeyboardUI> keyboard_ui_; |
| 323 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; | 328 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; |
| 324 std::unique_ptr<MediaDelegate> media_delegate_; | 329 std::unique_ptr<MediaDelegate> media_delegate_; |
| 325 std::unique_ptr<MruWindowTracker> mru_window_tracker_; | 330 std::unique_ptr<MruWindowTracker> mru_window_tracker_; |
| 331 std::unique_ptr<NewWindowDelegate> new_window_delegate_; |
| 326 std::unique_ptr<ShelfDelegate> shelf_delegate_; | 332 std::unique_ptr<ShelfDelegate> shelf_delegate_; |
| 327 std::unique_ptr<ShelfModel> shelf_model_; | 333 std::unique_ptr<ShelfModel> shelf_model_; |
| 328 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; | 334 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; |
| 329 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; | 335 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; |
| 330 std::unique_ptr<ToastManager> toast_manager_; | 336 std::unique_ptr<ToastManager> toast_manager_; |
| 331 std::unique_ptr<WindowCycleController> window_cycle_controller_; | 337 std::unique_ptr<WindowCycleController> window_cycle_controller_; |
| 332 std::unique_ptr<WindowSelectorController> window_selector_controller_; | 338 std::unique_ptr<WindowSelectorController> window_selector_controller_; |
| 333 | 339 |
| 334 base::ObserverList<LockStateObserver> lock_state_observers_; | 340 base::ObserverList<LockStateObserver> lock_state_observers_; |
| 335 | 341 |
| 336 bool simulate_modal_window_open_for_testing_ = false; | 342 bool simulate_modal_window_open_for_testing_ = false; |
| 337 | 343 |
| 338 #if defined(OS_CHROMEOS) | 344 #if defined(OS_CHROMEOS) |
| 339 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 345 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
| 340 #endif | 346 #endif |
| 341 }; | 347 }; |
| 342 | 348 |
| 343 } // namespace ash | 349 } // namespace ash |
| 344 | 350 |
| 345 #endif // ASH_COMMON_WM_SHELL_H_ | 351 #endif // ASH_COMMON_WM_SHELL_H_ |
| OLD | NEW |