Adds AppListDelegate to AppList that is notified on visibility changes

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"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/display/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace app_list {
 namespace {
 
 // Duration for show/hide animation in milliseconds.
 const int kAnimationDurationMs = 200;
 
 // The maximum shift in pixels when over-scroll happens.
 const int kMaxOverScrollShift = 48;
@@ skipping 87 matching lines @@
 
 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());
+  app_list_->OnVisibilityChanged(IsVisible(), GetDisplayId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterImpl, private:
 
 void AppListPresenterImpl::SetView(AppListView* view) {
   DCHECK(view_ == nullptr);
   DCHECK(is_visible_);
 
   view_ = view;
@@ skipping 44 matching lines @@
 
   ui::ScopedLayerAnimationSettings animation(layer->GetAnimator());
   animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
       is_visible_ ? 0 : kAnimationDurationMs));
   animation.AddObserver(this);
 
   layer->SetOpacity(is_visible_ ? 1.0 : 0.0);
   widget->SetBounds(target_bounds);
 }
 
+int64_t AppListPresenterImpl::GetDisplayId() {
+  views::Widget* widget = view_ ? view_->GetWidget() : nullptr;
+  if (!widget)
+    return display::kInvalidDisplayId;
+  return display::Screen::GetScreen()
+      ->GetDisplayNearestWindow(widget->GetNativeView())
+      .id();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterImpl,  aura::client::FocusChangeObserver implementation:
 
 void AppListPresenterImpl::OnWindowFocused(aura::Window* gained_focus,
                                            aura::Window* lost_focus) {
   if (view_ && is_visible_) {
     aura::Window* applist_window = view_->GetWidget()->GetNativeView();
     aura::Window* applist_container = applist_window->parent();
     if (applist_container->Contains(lost_focus) &&
         (!gained_focus || !applist_container->Contains(gained_focus)) &&
@@ skipping 29 matching lines @@
   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);
+    app_list_->OnVisibilityChanged(visible, GetDisplayId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListPresenterImpl, PaginationModelObserver implementation:
 
 void AppListPresenterImpl::TotalPagesChanged() {}
 
 void AppListPresenterImpl::SelectedPageChanged(int old_selected,
                                                int new_selected) {
   current_apps_page_ = new_selected;
@@ skipping 37 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