| 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 23 matching lines...) Expand all Loading... |
| 34 class Display; | 34 class Display; |
| 35 class ManagedDisplayInfo; | 35 class ManagedDisplayInfo; |
| 36 } | 36 } |
| 37 | 37 |
| 38 namespace gfx { | 38 namespace gfx { |
| 39 class Insets; | 39 class Insets; |
| 40 class Point; | 40 class Point; |
| 41 } | 41 } |
| 42 | 42 |
| 43 namespace preferences { | 43 namespace preferences { |
| 44 class PrefObserverStore; | 44 class PrefClientStore; |
| 45 } | 45 } |
| 46 | 46 |
| 47 namespace views { | 47 namespace views { |
| 48 class PointerWatcher; | 48 class PointerWatcher; |
| 49 enum class PointerWatcherEventTypes; | 49 enum class PointerWatcherEventTypes; |
| 50 } | 50 } |
| 51 | 51 |
| 52 namespace ash { | 52 namespace ash { |
| 53 class AcceleratorController; | 53 class AcceleratorController; |
| 54 class AccessibilityDelegate; | 54 class AccessibilityDelegate; |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 return new_window_controller_.get(); | 164 return new_window_controller_.get(); |
| 165 } | 165 } |
| 166 | 166 |
| 167 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. | 167 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. |
| 168 void set_root_window_for_new_windows(WmWindow* root) { | 168 void set_root_window_for_new_windows(WmWindow* root) { |
| 169 root_window_for_new_windows_ = root; | 169 root_window_for_new_windows_ = root; |
| 170 } | 170 } |
| 171 | 171 |
| 172 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } | 172 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } |
| 173 | 173 |
| 174 preferences::PrefObserverStore* pref_store() { return pref_store_.get(); } | 174 preferences::PrefClientStore* pref_store() { return pref_store_.get(); } |
| 175 | 175 |
| 176 SessionController* session_controller() { return session_controller_.get(); } | 176 SessionController* session_controller() { return session_controller_.get(); } |
| 177 | 177 |
| 178 ShelfController* shelf_controller() { return shelf_controller_.get(); } | 178 ShelfController* shelf_controller() { return shelf_controller_.get(); } |
| 179 | 179 |
| 180 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } | 180 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } |
| 181 | 181 |
| 182 ShelfModel* shelf_model(); | 182 ShelfModel* shelf_model(); |
| 183 | 183 |
| 184 ShutdownController* shutdown_controller() { | 184 ShutdownController* shutdown_controller() { |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 aura::Window* gained_active, | 499 aura::Window* gained_active, |
| 500 aura::Window* lost_active) override; | 500 aura::Window* lost_active) override; |
| 501 void OnAttemptToReactivateWindow(aura::Window* request_active, | 501 void OnAttemptToReactivateWindow(aura::Window* request_active, |
| 502 aura::Window* actual_active) override; | 502 aura::Window* actual_active) override; |
| 503 | 503 |
| 504 static WmShell* instance_; | 504 static WmShell* instance_; |
| 505 | 505 |
| 506 base::ObserverList<ShellObserver> shell_observers_; | 506 base::ObserverList<ShellObserver> shell_observers_; |
| 507 std::unique_ptr<ShellDelegate> delegate_; | 507 std::unique_ptr<ShellDelegate> delegate_; |
| 508 | 508 |
| 509 scoped_refptr<preferences::PrefObserverStore> pref_store_; | 509 scoped_refptr<preferences::PrefClientStore> pref_store_; |
| 510 | 510 |
| 511 std::unique_ptr<AcceleratorController> accelerator_controller_; | 511 std::unique_ptr<AcceleratorController> accelerator_controller_; |
| 512 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; | 512 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; |
| 513 std::unique_ptr<app_list::AppList> app_list_; | 513 std::unique_ptr<app_list::AppList> app_list_; |
| 514 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; | 514 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; |
| 515 std::unique_ptr<CastConfigController> cast_config_; | 515 std::unique_ptr<CastConfigController> cast_config_; |
| 516 std::unique_ptr<FocusCycler> focus_cycler_; | 516 std::unique_ptr<FocusCycler> focus_cycler_; |
| 517 std::unique_ptr<ImmersiveContextAsh> immersive_context_; | 517 std::unique_ptr<ImmersiveContextAsh> immersive_context_; |
| 518 std::unique_ptr<KeyboardBrightnessControlDelegate> | 518 std::unique_ptr<KeyboardBrightnessControlDelegate> |
| 519 keyboard_brightness_control_delegate_; | 519 keyboard_brightness_control_delegate_; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 | 551 |
| 552 bool added_activation_observer_ = false; | 552 bool added_activation_observer_ = false; |
| 553 base::ObserverList<WmActivationObserver> activation_observers_; | 553 base::ObserverList<WmActivationObserver> activation_observers_; |
| 554 | 554 |
| 555 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 555 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 556 }; | 556 }; |
| 557 | 557 |
| 558 } // namespace ash | 558 } // namespace ash |
| 559 | 559 |
| 560 #endif // ASH_COMMON_WM_SHELL_H_ | 560 #endif // ASH_COMMON_WM_SHELL_H_ |
| OLD | NEW |