Use mojo app list interfaces for mash and classic ash.

ash/common/wm_shell.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/ash_focus_manager_factory.h"
@@ skipping 31 matching lines @@
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/system_modal_container_layout_manager.h"
 #include "ash/common/wm/window_cycle_controller.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/bind.h"
 #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"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h"
 #include "ash/common/system/chromeos/keyboard_brightness_controller.h"
 #include "ash/common/system/chromeos/network/vpn_list.h"
 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
 #endif
 
@@ skipping 260 matching lines @@
   }
   for (WmWindow* root_window : root_windows) {
     root_window->GetRootWindowController()
         ->GetSystemModalLayoutManager(removed)
         ->DestroyModalBackground();
   }
 }
 
 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) {
   keyboard_ui_ = std::move(keyboard_ui);
 }
 
 void WmShell::SetSystemTrayDelegate(
     std::unique_ptr<SystemTrayDelegate> delegate) {
   DCHECK(delegate);
   system_tray_delegate_ = std::move(delegate);
@@ skipping 49 matching lines @@
 }
 
 void WmShell::SessionStateChanged(session_manager::SessionState state) {
   // Create the shelf when a session becomes active. It's safe to do this
   // multiple times (e.g. initial login vs. multiprofile add session).
   if (state == session_manager::SessionState::ACTIVE)
     CreateShelf();
 }
 
 }  // namespace ash