PreferencesManager

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index b7adf68b69edb12a1230eb3f5a131ec648ae1cdd..bd0e351b429edd721a9c31259cd33beff706ce5f 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -17,10 +17,13 @@
 #include "ash/common/wm/lock_state_observer.h"
 #include "base/observer_list.h"
 #include "components/ui_devtools/devtools_server.h"
+#include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/wm/public/window_types.h"
 
+class PrefObserverStore;

[sadrul, 2016/12/06 18:34:29]

Shouldn't this be in some namespace?

[jonross, 2016/12/06 21:09:32]

Whoops, yeah missed this when moving from components/prefs/ into its own
service.

Done.

+
 namespace base {
 class SequencedWorkerPool;
 }
@@ -153,6 +156,8 @@ class ASH_EXPORT WmShell {
 
   PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
 
+  PrefObserverStore* pref_store() { return pref_store_.get(); }
+
   ShelfController* shelf_controller() { return shelf_controller_.get(); }
 
   ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
@@ -471,11 +476,16 @@ class ASH_EXPORT WmShell {
   friend class Shell;
   friend class WmShellTestApi;
 
+  // Callback for getting entries from |catalog_|.
+  void OnGotCatalogEntries(std::vector<catalog::mojom::EntryPtr> entries);
+
   static WmShell* instance_;
 
   base::ObserverList<ShellObserver> shell_observers_;
   std::unique_ptr<ShellDelegate> delegate_;
 
+  catalog::mojom::CatalogPtr catalog_;
+
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
@@ -490,6 +500,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_store_;
   std::unique_ptr<ShelfController> shelf_controller_;
   std::unique_ptr<ShelfDelegate> shelf_delegate_;
   std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;