Add app_list_presenterr pointer in app_list_presenter_delegate_mus to use dismiss function

chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.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 "chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.h"
 
 #include "ui/app_list/presenter/app_list_view_delegate_factory.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
+#include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/pointer_watcher.h"
+#include "ash/common/shelf/wm_shelf.h"

[mfomitchev, 2016/09/23 19:47:15]

We shouldn't depend on any of the ash classes. With Mustash, ash and chrome are
running in a separate processes. This delegate is in the chrome (browser)
process, so it shouldn't depend on anything in ash or try to communicate with
any ash classes directly.

[thanhph, 2016/09/29 18:12:08]

Good point. I forget to remove these ash includes.

+#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_window.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_types.h"
+
 namespace {
 
 // Gets the point at the center of the display. The calculation should exclude
 // the virtual keyboard area. If the height of the display area is less than
 // |minimum_height|, its bottom will be extended to that height (so that the
 // app list never starts above the top of the screen).
 gfx::Point GetCenterOfDisplay(int64_t display_id, int minimum_height) {
   // TODO(mfomitchev): account for virtual keyboard.
   std::vector<display::Display> displays =
       display::Screen::GetScreen()->GetAllDisplays();
   auto it = std::find_if(displays.begin(), displays.end(),
                          [display_id](const display::Display& display) {
                            return display.id() == display_id;
                          });
   DCHECK(it != displays.end());
   gfx::Rect bounds = it->bounds();
 
   // Apply the |minimum_height|.
   if (bounds.height() < minimum_height)
     bounds.set_height(minimum_height);
 
   return bounds.CenterPoint();
 }
 
 }  // namespace
 
 AppListPresenterDelegateMus::AppListPresenterDelegateMus(
+    app_list::AppListPresenter* presenter,
     app_list::AppListViewDelegateFactory* view_delegate_factory)
-    : view_delegate_factory_(view_delegate_factory) {}
+    : view_delegate_factory_(view_delegate_factory),
+      presenter_(presenter){
+          //  ash::WmShell::Get()->AddShellObserver(this);
+      };
 
-AppListPresenterDelegateMus::~AppListPresenterDelegateMus() {}
+AppListPresenterDelegateMus::~AppListPresenterDelegateMus() {
+  //  views::WindowManagerConnection::Get()

[mfomitchev, 2016/09/23 19:47:15]

I think we do want this?

[thanhph, 2016/09/29 18:12:08]

Yes..I'll add this back. 

+  //        ->pointer_watcher_event_router()
+  //        ->RemovePointerWatcher(this);
+}
 
 app_list::AppListViewDelegate* AppListPresenterDelegateMus::GetViewDelegate() {
   return view_delegate_factory_->GetDelegate();
 }
 
 void AppListPresenterDelegateMus::Init(app_list::AppListView* view,
                                        int64_t display_id,
                                        int current_apps_page) {
+  LOG(ERROR) << "\n\n!!!!!. Initializing AppListPresenterDelegateMus\n\n\n";
   view_ = view;
 
   // Note: This would place the app list into the USER_WINDOWS container, unlike
   // in classic ash, where it has it's own container.
   // Note: We can't center the app list until we have its dimensions, so we
   // init at (0, 0) and then reset its anchor point.
   // TODO(mfomitchev): We are currently passing NULL for |parent|. It seems like
   // the only thing this is used for is choosing the right scale factor in
   // AppListMainView::PreloadIcons(), so we take care of that - perhaps by
   // passing the display_id or the scale factor directly
   view->InitAsBubbleAtFixedLocation(nullptr /* parent */, current_apps_page,
                                     gfx::Point(), views::BubbleBorder::FLOAT,
                                     true /* border_accepts_events */);
 
   view->SetAnchorPoint(
       GetCenterOfDisplay(display_id, GetMinimumBoundsHeightForAppList(view)));
 
+  views::WindowManagerConnection::Get()
+      ->pointer_watcher_event_router()
+      ->AddPointerWatcher(this, true);

[mfomitchev, 2016/09/23 19:47:15]

Any reason we passing true for |wants_moves|? I think are only interested in
touches and mouse clicks.

[thanhph, 2016/09/29 18:12:08]

That makes sense, will make the code faster by setting it to false

+
   // TODO(mfomitchev): Setup updating bounds on keyboard bounds change.
   // TODO(mfomitchev): Setup dismissing on mouse/touch gesture anywhere outside
   // the bounds of the app list.
   // TODO(mfomitchev): Setup dismissing on maximize (touch-view) mode start/end.
   // TODO(mfomitchev): Setup DnD.
   // TODO(mfomitchev): UpdateAutoHideState for shelf
 }
 
 void AppListPresenterDelegateMus::OnShown(int64_t display_id) {
   is_visible_ = true;
 }
 
 void AppListPresenterDelegateMus::OnDismissed() {
-  DCHECK(is_visible_);
-  is_visible_ = false;
+  presenter_->Dismiss();

[mfomitchev, 2016/09/23 19:47:15]

This will cause an infinite loop, since Dismiss() calls OnDismiss(). Leave this
the way it was. Instead call presenter_->Dismiss() in OnPointerEventObserved()

[thanhph, 2016/09/29 18:12:08]

my function is OnDismissed not OnDismiss so it'll be ok. But I'll remove
function AppListPresenterDelegateMus::OnDismissed() to enhance clarity. 

 }
 
 void AppListPresenterDelegateMus::UpdateBounds() {
   if (!view_ || !is_visible_)
+
     return;
 
   view_->UpdateBounds();
 }
 
+void AppListPresenterDelegateMus::OnPointerEventObserved(
+    const ui::PointerEvent& event,
+    const gfx::Point& location_in_screen,
+    views::Widget* target) {
+  LOG(ERROR) << "\n\n!!!!!. Closing ?\n\n\n";
+
+  if (event.type() == ui::ET_TOUCH_PRESSED ||
+      event.type() == ui::ET_POINTER_DOWN) {
+    if (!target) {
+      //
+      LOG(ERROR) << "\n\n!!!!!. Closing OnPointerEventObserved\n\n\n";
+      //        view_->app_list_main_view_->close();
+      //        view_->CloseAppList();
+      //        target->Hide();
+      this->OnDismissed();

[mfomitchev, 2016/09/23 19:47:15]

presenter_->Dismiss()

[thanhph, 2016/09/29 18:12:08]

Thanks.. This is cleaner.

+      //        OnDismissed();
+      //        target->CloseNow();
+      //        target->GetTopLevelWidget()->CloseNow();
+    } else {
+      LOG(ERROR) << "\n\n!!!!!  target->GetWindowBoundsInScreen().ToString():"
+                 << target->GetWindowBoundsInScreen().ToString() << "\n\n\n";
+
+      //      LOG(ERROR) << "x:" << target->bounds.x()
+      //                 << "x:" << target->bounds.y()
+      //                 << "width:" << target->bounds.width()
+      //                 << "height:" << target->bounds.height() ;
+    }
+  }
+}
+
 gfx::Vector2d AppListPresenterDelegateMus::GetVisibilityAnimationOffset(
     aura::Window* root_window) {
   // TODO(mfomitchev): Classic ash does different animation here depending on
   // shelf alignment. We should probably do that too.
   return gfx::Vector2d(0, kAnimationOffset);
 }