Chromium Code Reviews| Index: ash/common/wm_shell.h |
| diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h |
| index 65ad4a224964c49766a098168225dafb75667b19..21a2a83562ead8ff3060574ac6df48cee5b98f1f 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 "ui/app_list/presenter/app_list.h" |
|
James Cook
2016/12/10 00:50:08
Hmm. I've been trying to avoid dependencies in wm_
msw
2016/12/10 01:08:12
Done.
|
| #include "ui/base/ui_base_types.h" |
| #include "ui/compositor/layer_type.h" |
| #include "ui/wm/public/window_types.h" |
| @@ -116,6 +117,8 @@ class ASH_EXPORT WmShell { |
| return accessibility_delegate_.get(); |
| } |
| + app_list::AppList* app_list() { return app_list_.get(); } |
| + |
| BrightnessControlDelegate* brightness_control_delegate() { |
| return brightness_control_delegate_.get(); |
| } |
| @@ -478,6 +481,7 @@ class ASH_EXPORT WmShell { |
| std::unique_ptr<AcceleratorController> accelerator_controller_; |
| std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; |
| + std::unique_ptr<app_list::AppList> app_list_; |
| std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; |
| std::unique_ptr<CastConfigController> cast_config_; |
| std::unique_ptr<FocusCycler> focus_cycler_; |