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

Unified Diff: ash/common/wm_shell.cc

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/wm_shell.h ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 08ef8c000944ce10b6e043f84a5d5e4cf19b86a6..0ddea52b2de12fd25432d17d42254799a86d6047 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -45,7 +45,6 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
-#include "ui/app_list/presenter/app_list.h"
#include "ui/display/display.h"
namespace ash {
@@ -144,8 +143,7 @@ void WmShell::SetShelfDelegateForTesting(
}
WmShell::WmShell()
- : app_list_(base::MakeUnique<app_list::AppList>()),
- brightness_control_delegate_(
+ : brightness_control_delegate_(
base::MakeUnique<system::BrightnessControllerChromeos>()),
cast_config_(base::MakeUnique<CastConfigController>()),
focus_cycler_(base::MakeUnique<FocusCycler>()),
@@ -168,7 +166,6 @@ WmShell::WmShell()
DCHECK(!instance_);
instance_ = this;
session_controller_->AddSessionStateObserver(this);
-
}
RootWindowController* WmShell::GetPrimaryRootWindowController() {
@@ -223,30 +220,6 @@ void WmShell::OnModalWindowRemoved(WmWindow* removed) {
}
}
-void WmShell::ShowAppList() {
- // Show the app list on the default display for new windows.
- app_list_->Show(
- Shell::GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
-}
-
-void WmShell::DismissAppList() {
- app_list_->Dismiss();
-}
-
-void WmShell::ToggleAppList() {
- // Toggle the app list on the default display for new windows.
- app_list_->ToggleAppList(
- Shell::GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
-}
-
-bool WmShell::IsApplistVisible() const {
- return app_list_->IsVisible();
-}
-
-bool WmShell::GetAppListTargetVisibility() const {
- return app_list_->GetTargetVisibility();
-}
-
void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) {
keyboard_ui_ = std::move(keyboard_ui);
}
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698