| 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 21 matching lines...) Expand all Loading... |
| 32 namespace display { | 32 namespace display { |
| 33 class Display; | 33 class Display; |
| 34 class ManagedDisplayInfo; | 34 class ManagedDisplayInfo; |
| 35 } | 35 } |
| 36 | 36 |
| 37 namespace gfx { | 37 namespace gfx { |
| 38 class Insets; | 38 class Insets; |
| 39 class Point; | 39 class Point; |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace preferences { |
| 43 class PrefObserverStore; |
| 44 } |
| 45 |
| 42 namespace views { | 46 namespace views { |
| 43 class PointerWatcher; | 47 class PointerWatcher; |
| 44 enum class PointerWatcherEventTypes; | 48 enum class PointerWatcherEventTypes; |
| 45 } | 49 } |
| 46 | 50 |
| 47 namespace ash { | 51 namespace ash { |
| 48 class AcceleratorController; | 52 class AcceleratorController; |
| 49 class AccessibilityDelegate; | 53 class AccessibilityDelegate; |
| 50 class BrightnessControlDelegate; | 54 class BrightnessControlDelegate; |
| 51 class CastConfigController; | 55 class CastConfigController; |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 return new_window_controller_.get(); | 158 return new_window_controller_.get(); |
| 155 } | 159 } |
| 156 | 160 |
| 157 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. | 161 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. |
| 158 void set_root_window_for_new_windows(WmWindow* root) { | 162 void set_root_window_for_new_windows(WmWindow* root) { |
| 159 root_window_for_new_windows_ = root; | 163 root_window_for_new_windows_ = root; |
| 160 } | 164 } |
| 161 | 165 |
| 162 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } | 166 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } |
| 163 | 167 |
| 168 preferences::PrefObserverStore* pref_store() { return pref_store_.get(); } |
| 169 |
| 164 SessionController* session_controller() { return session_controller_.get(); } | 170 SessionController* session_controller() { return session_controller_.get(); } |
| 165 | 171 |
| 166 ShelfController* shelf_controller() { return shelf_controller_.get(); } | 172 ShelfController* shelf_controller() { return shelf_controller_.get(); } |
| 167 | 173 |
| 168 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } | 174 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } |
| 169 | 175 |
| 170 ShelfModel* shelf_model(); | 176 ShelfModel* shelf_model(); |
| 171 | 177 |
| 172 ShutdownController* shutdown_controller() { | 178 ShutdownController* shutdown_controller() { |
| 173 return shutdown_controller_.get(); | 179 return shutdown_controller_.get(); |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 friend class AcceleratorControllerTest; | 485 friend class AcceleratorControllerTest; |
| 480 friend class ScopedRootWindowForNewWindows; | 486 friend class ScopedRootWindowForNewWindows; |
| 481 friend class Shell; | 487 friend class Shell; |
| 482 friend class WmShellTestApi; | 488 friend class WmShellTestApi; |
| 483 | 489 |
| 484 static WmShell* instance_; | 490 static WmShell* instance_; |
| 485 | 491 |
| 486 base::ObserverList<ShellObserver> shell_observers_; | 492 base::ObserverList<ShellObserver> shell_observers_; |
| 487 std::unique_ptr<ShellDelegate> delegate_; | 493 std::unique_ptr<ShellDelegate> delegate_; |
| 488 | 494 |
| 495 scoped_refptr<preferences::PrefObserverStore> pref_store_; |
| 496 |
| 489 std::unique_ptr<AcceleratorController> accelerator_controller_; | 497 std::unique_ptr<AcceleratorController> accelerator_controller_; |
| 490 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; | 498 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; |
| 491 std::unique_ptr<app_list::AppList> app_list_; | 499 std::unique_ptr<app_list::AppList> app_list_; |
| 492 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; | 500 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; |
| 493 std::unique_ptr<CastConfigController> cast_config_; | 501 std::unique_ptr<CastConfigController> cast_config_; |
| 494 std::unique_ptr<FocusCycler> focus_cycler_; | 502 std::unique_ptr<FocusCycler> focus_cycler_; |
| 495 std::unique_ptr<ImmersiveContextAsh> immersive_context_; | 503 std::unique_ptr<ImmersiveContextAsh> immersive_context_; |
| 496 std::unique_ptr<KeyboardBrightnessControlDelegate> | 504 std::unique_ptr<KeyboardBrightnessControlDelegate> |
| 497 keyboard_brightness_control_delegate_; | 505 keyboard_brightness_control_delegate_; |
| 498 std::unique_ptr<KeyboardUI> keyboard_ui_; | 506 std::unique_ptr<KeyboardUI> keyboard_ui_; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 529 | 537 |
| 530 #if defined(OS_CHROMEOS) | 538 #if defined(OS_CHROMEOS) |
| 531 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 539 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
| 532 std::unique_ptr<VpnList> vpn_list_; | 540 std::unique_ptr<VpnList> vpn_list_; |
| 533 #endif | 541 #endif |
| 534 }; | 542 }; |
| 535 | 543 |
| 536 } // namespace ash | 544 } // namespace ash |
| 537 | 545 |
| 538 #endif // ASH_COMMON_WM_SHELL_H_ | 546 #endif // ASH_COMMON_WM_SHELL_H_ |
| OLD | NEW |