Chromium Code Reviews| Index: ash/common/wm_shell.h |
| diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h |
| index 2c7a1548972c36a3c193ec513650f6f6a71cd521..954280d5daa99796b3d51425a9f988b0127aa143 100644 |
| --- a/ash/common/wm_shell.h |
| +++ b/ash/common/wm_shell.h |
| @@ -21,6 +21,8 @@ |
| #include "ui/compositor/layer_type.h" |
| #include "ui/wm/public/window_types.h" |
| +class PrefObserverStore; |
| + |
| namespace base { |
| class SequencedWorkerPool; |
| } |
| @@ -152,6 +154,10 @@ class ASH_EXPORT WmShell { |
| PaletteDelegate* palette_delegate() { return palette_delegate_.get(); } |
| + PrefObserverStore* pref_observer_store() { |
|
James Cook
2016/11/18 23:56:05
optional naming thought: Since most of ash is goin
jonross
2016/11/19 00:28:20
I like the idea of renaming this as pref_store. On
|
| + return pref_observer_store_.get(); |
| + } |
| + |
| ShelfController* shelf_controller() { return shelf_controller_.get(); } |
| ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); } |
| @@ -487,6 +493,7 @@ class ASH_EXPORT WmShell { |
| std::unique_ptr<MruWindowTracker> mru_window_tracker_; |
| std::unique_ptr<mojom::NewWindowClient> new_window_client_; |
| std::unique_ptr<PaletteDelegate> palette_delegate_; |
| + scoped_refptr<PrefObserverStore> pref_observer_store_; |
| std::unique_ptr<ShelfController> shelf_controller_; |
| std::unique_ptr<ShelfDelegate> shelf_delegate_; |
| std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; |