Use mojo app list interfaces for mash and classic ash.

ui/app_list/presenter/app_list_presenter_impl.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 "ui/app_list/presenter/app_list_presenter_impl.h"
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/presenter/app_list_presenter_delegate_factory.h"
@@ skipping 13 matching lines @@
 // The maximum shift in pixels when over-scroll happens.
 const int kMaxOverScrollShift = 48;
 
 ui::Layer* GetLayer(views::Widget* widget) {
   return widget->GetNativeView()->layer();
 }
 
 }  // namespace
 
 AppListPresenterImpl::AppListPresenterImpl(
-    AppListPresenterDelegateFactory* factory)
-    : factory_(factory) {
-  DCHECK(factory);
+    std::unique_ptr<AppListPresenterDelegateFactory> factory)
+    : factory_(std::move(factory)) {
+  DCHECK(factory_);
 }
 
 AppListPresenterImpl::~AppListPresenterImpl() {
   Dismiss();
   presenter_delegate_.reset();
   // Ensures app list view goes before the controller since pagination model
   // lives in the controller and app list view would access it on destruction.
   if (view_) {
     view_->GetAppsPaginationModel()->RemoveObserver(this);
     if (view_->GetWidget())
       view_->GetWidget()->CloseNow();
   }
 }
 
 aura::Window* AppListPresenterImpl::GetWindow() {
   return is_visible_ && view_ ? view_->GetWidget()->GetNativeWindow() : nullptr;
 }
 
 void AppListPresenterImpl::Show(int64_t display_id) {
   if (is_visible_)
     return;
 
   is_visible_ = true;
+  if (app_list_)
+    app_list_->OnTargetVisibilityChanged(GetTargetVisibility());
+
   if (view_) {
     ScheduleAnimation();
   } else {
     presenter_delegate_ = factory_->GetDelegate(this);
     AppListViewDelegate* view_delegate = presenter_delegate_->GetViewDelegate();
     DCHECK(view_delegate);
     // Note the AppListViewDelegate outlives the AppListView. For Ash, the view
     // is destroyed when dismissed.
     AppListView* view = new AppListView(view_delegate);
     presenter_delegate_->Init(view, display_id, current_apps_page_);
     SetView(view);
   }
   presenter_delegate_->OnShown(display_id);
 }
 
 void AppListPresenterImpl::Dismiss() {
   if (!is_visible_)
     return;
 
   // If the app list is currently visible, there should be an existing view.
   DCHECK(view_);
 
   is_visible_ = false;
+  if (app_list_)
+    app_list_->OnTargetVisibilityChanged(GetTargetVisibility());
 
   // The dismissal may have occurred in response to the app list losing
   // activation. Otherwise, our widget is currently active. When the animation
   // completes we'll hide the widget, changing activation. If a menu is shown
   // before the animation completes then the activation change triggers the menu
   // to close. By deactivating now we ensure there is no activation change when
   // the animation completes and any menus stay open.
   if (view_->GetWidget()->IsActive())
     view_->GetWidget()->Deactivate();
 
@@ skipping 10 matching lines @@
 }
 
 bool AppListPresenterImpl::IsVisible() const {
   return view_ && view_->GetWidget()->IsVisible();
 }
 
 bool AppListPresenterImpl::GetTargetVisibility() const {
   return is_visible_;
 }
 
+void AppListPresenterImpl::SetAppList(mojom::AppListPtr app_list) {
+  DCHECK(app_list);
+  app_list_ = std::move(app_list);
+  // Notify the app list interface of the current [target] visibility.
+  app_list_->OnTargetVisibilityChanged(GetTargetVisibility());
+  app_list_->OnVisibilityChanged(IsVisible());
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterImpl, private:
 
 void AppListPresenterImpl::SetView(AppListView* view) {
   DCHECK(view_ == nullptr);
   DCHECK(is_visible_);
 
   view_ = view;
   views::Widget* widget = view_->GetWidget();
   widget->AddObserver(this);
@@ skipping 81 matching lines @@
   if (is_visible_)
     view_->GetWidget()->Activate();
   else
     view_->GetWidget()->Close();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterImpl, views::WidgetObserver implementation:
 
 void AppListPresenterImpl::OnWidgetDestroying(views::Widget* widget) {
-  DCHECK(view_->GetWidget() == widget);
+  DCHECK_EQ(view_->GetWidget(), widget);
   if (is_visible_)
     Dismiss();
   ResetView();
 }
 
+void AppListPresenterImpl::OnWidgetVisibilityChanged(views::Widget* widget,
+                                                     bool visible) {
+  DCHECK_EQ(view_->GetWidget(), widget);
+  if (app_list_)
+    app_list_->OnVisibilityChanged(visible);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterImpl, PaginationModelObserver implementation:
 
 void AppListPresenterImpl::TotalPagesChanged() {}
 
 void AppListPresenterImpl::SelectedPageChanged(int old_selected,
                                                int new_selected) {
   current_apps_page_ = new_selected;
 }
 
@@ skipping 35 matching lines @@
   } else if (should_snap_back_) {
     should_snap_back_ = false;
     ui::ScopedLayerAnimationSettings animation(widget_animator);
     animation.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(kOverscrollPageTransitionDurationMs));
     widget->SetBounds(view_bounds_);
   }
 }
 
 }  // namespace app_list