| Index: ash/common/wm_shell.h
|
| diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
|
| index 1dff4ae3131b6042aa392e9ed7087d56236e5568..8fb7f5116a8d97ff456d22ce32a17929e47ddd6f 100644
|
| --- a/ash/common/wm_shell.h
|
| +++ b/ash/common/wm_shell.h
|
| @@ -17,6 +17,7 @@
|
| #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"
|
| @@ -35,6 +36,10 @@ class Insets;
|
| class Point;
|
| }
|
|
|
| +namespace preferences {
|
| +class PrefObserverStore;
|
| +}
|
| +
|
| namespace views {
|
| class PointerWatcher;
|
| enum class PointerWatcherEventTypes;
|
| @@ -156,6 +161,8 @@ class ASH_EXPORT WmShell {
|
|
|
| PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
|
|
|
| + preferences::PrefObserverStore* pref_store() { return pref_store_.get(); }
|
| +
|
| ShelfController* shelf_controller() { return shelf_controller_.get(); }
|
|
|
| ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
|
| @@ -474,11 +481,17 @@ 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_;
|
| + scoped_refptr<preferences::PrefObserverStore> pref_store_;
|
| +
|
| std::unique_ptr<AcceleratorController> accelerator_controller_;
|
| std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
|
| std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
|
|
|