Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2408)

Unified Diff: ash/common/wm_shell.h

Issue 2567523002: mash: Have chrome set itself as the app list presenter. (Closed)
Patch Set: Address comments. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 65ad4a224964c49766a098168225dafb75667b19..b0d33214be1f0ffc120602d9640a34ee47b32811 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -21,6 +21,10 @@
#include "ui/compositor/layer_type.h"
#include "ui/wm/public/window_types.h"
+namespace app_list {
+class AppList;
+}
+
namespace base {
class SequencedWorkerPool;
}
@@ -116,6 +120,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 +484,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_;

Powered by Google App Engine
This is Rietveld 408576698