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> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "ash/ash_export.h" | 13 #include "ash/ash_export.h" |
14 #include "ash/common/media_delegate.h" | 14 #include "ash/common/media_delegate.h" |
15 #include "ash/common/metrics/gesture_action_type.h" | 15 #include "ash/common/metrics/gesture_action_type.h" |
16 #include "ash/common/metrics/user_metrics_action.h" | 16 #include "ash/common/metrics/user_metrics_action.h" |
17 #include "ash/common/wm/lock_state_observer.h" | 17 #include "ash/common/wm/lock_state_observer.h" |
18 #include "base/observer_list.h" | 18 #include "base/observer_list.h" |
19 #include "components/ui_devtools/devtools_server.h" | 19 #include "components/ui_devtools/devtools_server.h" |
20 #include "ui/base/ui_base_types.h" | 20 #include "ui/base/ui_base_types.h" |
21 #include "ui/compositor/layer_type.h" | 21 #include "ui/compositor/layer_type.h" |
22 #include "ui/wm/public/window_types.h" | 22 #include "ui/wm/public/window_types.h" |
23 | 23 |
24 class PrefObserverStore; | |
25 | |
24 namespace base { | 26 namespace base { |
25 class SequencedWorkerPool; | 27 class SequencedWorkerPool; |
26 } | 28 } |
27 | 29 |
28 namespace display { | 30 namespace display { |
29 class Display; | 31 class Display; |
30 class ManagedDisplayInfo; | 32 class ManagedDisplayInfo; |
31 } | 33 } |
32 | 34 |
33 namespace gfx { | 35 namespace gfx { |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
145 return new_window_client_.get(); | 147 return new_window_client_.get(); |
146 } | 148 } |
147 | 149 |
148 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. | 150 // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily. |
149 void set_root_window_for_new_windows(WmWindow* root) { | 151 void set_root_window_for_new_windows(WmWindow* root) { |
150 root_window_for_new_windows_ = root; | 152 root_window_for_new_windows_ = root; |
151 } | 153 } |
152 | 154 |
153 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } | 155 PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } |
154 | 156 |
157 PrefObserverStore* pref_store() { return pref_store_.get(); } | |
158 | |
155 ShelfController* shelf_controller() { return shelf_controller_.get(); } | 159 ShelfController* shelf_controller() { return shelf_controller_.get(); } |
156 | 160 |
157 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } | 161 ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } |
158 | 162 |
159 ShelfModel* shelf_model(); | 163 ShelfModel* shelf_model(); |
160 | 164 |
161 ShutdownController* shutdown_controller() { | 165 ShutdownController* shutdown_controller() { |
162 return shutdown_controller_.get(); | 166 return shutdown_controller_.get(); |
163 } | 167 } |
164 | 168 |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
480 std::unique_ptr<ImmersiveContextAsh> immersive_context_; | 484 std::unique_ptr<ImmersiveContextAsh> immersive_context_; |
481 std::unique_ptr<KeyboardBrightnessControlDelegate> | 485 std::unique_ptr<KeyboardBrightnessControlDelegate> |
482 keyboard_brightness_control_delegate_; | 486 keyboard_brightness_control_delegate_; |
483 std::unique_ptr<KeyboardUI> keyboard_ui_; | 487 std::unique_ptr<KeyboardUI> keyboard_ui_; |
484 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; | 488 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; |
485 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; | 489 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; |
486 std::unique_ptr<MediaDelegate> media_delegate_; | 490 std::unique_ptr<MediaDelegate> media_delegate_; |
487 std::unique_ptr<MruWindowTracker> mru_window_tracker_; | 491 std::unique_ptr<MruWindowTracker> mru_window_tracker_; |
488 std::unique_ptr<mojom::NewWindowClient> new_window_client_; | 492 std::unique_ptr<mojom::NewWindowClient> new_window_client_; |
489 std::unique_ptr<PaletteDelegate> palette_delegate_; | 493 std::unique_ptr<PaletteDelegate> palette_delegate_; |
494 scoped_refptr<PrefObserverStore> pref_store_; | |
James Cook
2016/11/19 00:33:19
Sorry, I meant, store this as a scoped_refptr<Pref
jonross
2016/11/19 00:35:36
Ah, yeah.
I had planned for client code to call I
| |
490 std::unique_ptr<ShelfController> shelf_controller_; | 495 std::unique_ptr<ShelfController> shelf_controller_; |
491 std::unique_ptr<ShelfDelegate> shelf_delegate_; | 496 std::unique_ptr<ShelfDelegate> shelf_delegate_; |
492 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; | 497 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; |
493 std::unique_ptr<ShutdownController> shutdown_controller_; | 498 std::unique_ptr<ShutdownController> shutdown_controller_; |
494 std::unique_ptr<SystemTrayController> system_tray_controller_; | 499 std::unique_ptr<SystemTrayController> system_tray_controller_; |
495 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; | 500 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; |
496 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; | 501 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; |
497 std::unique_ptr<ToastManager> toast_manager_; | 502 std::unique_ptr<ToastManager> toast_manager_; |
498 std::unique_ptr<WallpaperController> wallpaper_controller_; | 503 std::unique_ptr<WallpaperController> wallpaper_controller_; |
499 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; | 504 std::unique_ptr<WallpaperDelegate> wallpaper_delegate_; |
(...skipping 12 matching lines...) Expand all Loading... | |
512 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 517 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
513 | 518 |
514 #if defined(OS_CHROMEOS) | 519 #if defined(OS_CHROMEOS) |
515 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 520 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
516 #endif | 521 #endif |
517 }; | 522 }; |
518 | 523 |
519 } // namespace ash | 524 } // namespace ash |
520 | 525 |
521 #endif // ASH_COMMON_WM_SHELL_H_ | 526 #endif // ASH_COMMON_WM_SHELL_H_ |
OLD | NEW |