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

Index: chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc b/chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc
index 979835f6d280510c829273f5b88028e2293c454f..07597c44003a91c91b6d3e85534c6326553364b0 100644
--- a/chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_presenter_delegate_mus.cc
@@ -3,11 +3,13 @@
 // 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 {
 
@@ -36,10 +38,15 @@ gfx::Point GetCenterOfDisplay(int64_t display_id, int minimum_height) {
 }  // 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();
@@ -65,9 +72,11 @@ void AppListPresenterDelegateMus::Init(app_list::AppListView* view,
   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
@@ -78,8 +87,6 @@ void AppListPresenterDelegateMus::OnShown(int64_t display_id) {
 }
 
 void AppListPresenterDelegateMus::OnDismissed() {
-  DCHECK(is_visible_);
-  is_visible_ = false;
 }
 
 void AppListPresenterDelegateMus::UpdateBounds() {
@@ -89,6 +96,19 @@ void AppListPresenterDelegateMus::UpdateBounds() {
   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