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

Unified Diff: ash/shell.h

Issue 2750483005: Moves app_list() and related functions from Shell to WmShell (Closed)
Patch Set: dont explicitly delete Created 3 years, 9 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
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index b1f816944a9545fcad685d60e20ea16f789a89ce..c258d1d3dbd1548472af30b25155f64073a9f4b2 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -43,6 +43,10 @@ namespace chromeos {
class AudioA11yController;
}
+namespace app_list {
+class AppList;
+}
+
namespace display {
class DisplayChangeObserver;
class DisplayConfigurator;
@@ -276,6 +280,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
AccessibilityDelegate* accessibility_delegate() {
return accessibility_delegate_.get();
}
+ app_list::AppList* app_list() { return app_list_.get(); }
const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() {
return blocking_pool_;
}
@@ -450,6 +455,22 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
void AddShellObserver(ShellObserver* observer);
void RemoveShellObserver(ShellObserver* observer);
+ // 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();
+
+ // Returns app list actual visibility. This might differ from
+ // GetAppListTargetVisibility() when hiding animation is still in flight.
+ bool IsAppListVisible() const;
+
+ // Returns app list target visibility.
+ bool GetAppListTargetVisibility() const;
+
// Notifies observers that maximize mode has started, windows might still
// animate.
void NotifyMaximizeModeStarted();
@@ -563,6 +584,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<::wm::ShadowController> shadow_controller_;
std::unique_ptr<::wm::VisibilityController> visibility_controller_;
std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
+ std::unique_ptr<app_list::AppList> app_list_;
scoped_refptr<preferences::PrefClientStore> pref_store_;
std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_;
std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698