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

Unified Diff: ash/common/wm_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/common/shelf/app_list_shelf_item_delegate.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index ecf2d82bf95b448423df3b62ba344a2bec27df40..2aaf72a94033ffcc7155889838c067501fc6c8f9 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -21,10 +21,6 @@
#include "ui/wm/public/activation_change_observer.h"
#include "ui/wm/public/window_types.h"
-namespace app_list {
-class AppList;
-}
-
namespace display {
class Display;
class ManagedDisplayInfo;
@@ -100,8 +96,6 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
return accelerator_controller_.get();
}
- app_list::AppList* app_list() { return app_list_.get(); }
-
BrightnessControlDelegate* brightness_control_delegate() {
return brightness_control_delegate_.get();
}
@@ -234,22 +228,6 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
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();
-
- // 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;
-
// Returns true if a window is currently pinned.
virtual bool IsPinned() = 0;
@@ -386,7 +364,6 @@ class ASH_EXPORT WmShell : public SessionStateObserver {
static WmShell* instance_;
std::unique_ptr<AcceleratorController> accelerator_controller_;
- 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_;
« no previous file with comments | « ash/common/shelf/app_list_shelf_item_delegate.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698