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

Unified Diff: ash/common/wm_shell.cc

Issue 2576913002: Use mojo app list interfaces for mash and classic ash. (Closed)
Patch Set: Fix AppListPresenterImplTest. 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.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 0bd31c79726c93aee3144a0d5907229ba092c74d..42d6250629db39051e255ee6a8f4efd912c6d947 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -49,7 +49,6 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "ui/app_list/presenter/app_list.h"
-#include "ui/app_list/presenter/app_list_presenter.h"
#include "ui/display/display.h"
#include "ui/views/focus/focus_manager_factory.h"
@@ -330,28 +329,25 @@ void WmShell::OnModalWindowRemoved(WmWindow* removed) {
void WmShell::ShowAppList() {
// Show the app list on the default display for new windows.
- int64_t display_id =
- GetRootWindowForNewWindows()->GetDisplayNearestWindow().id();
- delegate_->GetAppListPresenter()->Show(display_id);
+ app_list_->Show(GetRootWindowForNewWindows()->GetDisplayNearestWindow().id());
}
void WmShell::DismissAppList() {
- delegate_->GetAppListPresenter()->Dismiss();
+ app_list_->Dismiss();
}
void WmShell::ToggleAppList() {
- // Show the app list on the default display for new windows.
- int64_t display_id =
- GetRootWindowForNewWindows()->GetDisplayNearestWindow().id();
- delegate_->GetAppListPresenter()->ToggleAppList(display_id);
+ // Toggle the app list on the default display for new windows.
+ app_list_->ToggleAppList(
+ GetRootWindowForNewWindows()->GetDisplayNearestWindow().id());
}
bool WmShell::IsApplistVisible() const {
- return delegate_->GetAppListPresenter()->IsVisible();
+ return app_list_->IsVisible();
}
bool WmShell::GetAppListTargetVisibility() const {
- return delegate_->GetAppListPresenter()->GetTargetVisibility();
+ return app_list_->GetTargetVisibility();
}
void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) {
« no previous file with comments | « ash/common/shell_delegate.h ('k') | ash/mus/BUILD.gn » ('j') | ash/shelf/shelf_view_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698