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_presenter.h"

[mfomitchev, 2016/09/29 21:21:22]

insert blank line
See
https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes

[thanhph, 2016/09/29 23:08:00]

done! Let me know if it's incorrect.

 #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/pointer_watcher_event_router.h"
+#include "ui/views/mus/window_manager_connection.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) {}
+    : presenter_(presenter), view_delegate_factory_(view_delegate_factory) {}
 
-AppListPresenterDelegateMus::~AppListPresenterDelegateMus() {}
+AppListPresenterDelegateMus::~AppListPresenterDelegateMus() {
+  views::WindowManagerConnection::Get()

[mfomitchev, 2016/09/29 21:21:22]

If Init() is never called, I think this will trip over the DCHECK here
https://cs.chromium.org/chromium/src/ui/views/mus/pointer_watcher_event_route...

Maybe we can get rid of that DCHECK? Otherwise we should make sure we only
remove the watcher if we've previously added it. E.g. by moving the
AddPointerWatcher() to the constructor.

[thanhph, 2016/09/29 23:08:00]

Good catch! I haven't been able to start the app list widget without running
Init but there's possibly a bypass way as you mentioned. I moved
AddPointerWatcher() to the constructor just in case. Thanks!

+      ->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) {
   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/29 21:21:21]

I don't think we want moves? So we need to pass false here, otherwise the
callback will be unnecessarily spammy.

[thanhph, 2016/09/29 23:08:00]

I agree. I don't know why this value got reverted back to true. Anyway, changed
it back 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;
 }
 
 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) {
+  // Dismiss app list on a mouse click or touch outside of the app list window.
+  if (event.type() == ui::ET_TOUCH_PRESSED ||
+      event.type() == ui::ET_POINTER_DOWN) {
+    if (!target or target != view_->GetWidget()) {

[mfomitchev, 2016/09/29 21:21:21]

|| instead of "or"
Also no {} brackets for 1-line if bodies.

[thanhph, 2016/09/29 23:08:00]

good catch. Thanks!

+      presenter_->Dismiss();
+    }
+  }
+}
+
 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);
 }