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

Unified Diff: ash/common/wm_shell.h

Issue 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move files, cleanup Created 4 years, 5 months 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 3ae326554ffedc20e7cbc51e393428051bd4781a..71e7480ffae5f9ce3e00d50341975c1139116f3c 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -31,6 +31,7 @@ class MaximizeModeController;
class MruWindowTracker;
class ScopedDisableInternalMouseAndKeyboard;
class SessionStateDelegate;
+class ShelfModel;
class ShellDelegate;
class ShellObserver;
class SystemTrayDelegate;
@@ -92,6 +93,8 @@ class ASH_EXPORT WmShell {
MediaDelegate* media_delegate() { return media_delegate_.get(); }
+ ShelfModel* shelf_model() { return shelf_model_.get(); }
+
SystemTrayNotifier* system_tray_notifier() {
return system_tray_notifier_.get();
}
@@ -146,6 +149,22 @@ class ASH_EXPORT WmShell {
simulate_modal_window_open_for_testing_ = modal_window_open;
}
+ // Shows the app list on the active root window.
+ void ShowAppList();
+
+ // Dismisses the app list.
+ void DismissAppList();
+
+ // Shows the app list if it's not visible. Dismisses it otherwise.
+ void ToggleAppList();
msw 2016/07/20 17:33:49 optional nit: This only really has two callers (Ha
James Cook 2016/07/20 18:35:39 I'm going to keep the applist functions as-is. It
+
+ // Returns app list actual visibility. This might differ from
+ // GetAppListTargetVisibility() when hiding animation is still in flight.
msw 2016/07/20 17:33:49 optional nit: It'd also be nice to only have a sin
+ bool IsApplistVisible() const;
+
+ // Returns app list target visibility.
+ bool GetAppListTargetVisibility() const;
+
// Returns true if a window is currently pinned.
virtual bool IsPinned() = 0;
@@ -277,6 +296,7 @@ class ASH_EXPORT WmShell {
std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
std::unique_ptr<MediaDelegate> media_delegate_;
std::unique_ptr<MruWindowTracker> mru_window_tracker_;
+ std::unique_ptr<ShelfModel> shelf_model_;
std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
std::unique_ptr<WindowCycleController> window_cycle_controller_;

Powered by Google App Engine
This is Rietveld 408576698