mash: Fix shelf overflow bubble not closing on click outside its bounds

ash/shelf/overflow_bubble.h

 // Copyright 2013 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.
 
 #ifndef ASH_SHELF_OVERFLOW_BUBBLE_H_
 #define ASH_SHELF_OVERFLOW_BUBBLE_H_
 
-#include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "ui/events/event_handler.h"
+#include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace ui {
 class LocatedEvent;
 }
 
 namespace views {
 class View;
 }
 
 namespace ash {
 class OverflowBubbleView;
 class ShelfLayoutManager;
 class ShelfView;
 
 // OverflowBubble displays the overflown launcher items in a bubble.
-class OverflowBubble : public ui::EventHandler,
+class OverflowBubble : public views::PointerWatcher,
                        public views::WidgetObserver {
  public:
   OverflowBubble();
   ~OverflowBubble() override;
 
   // Shows an bubble pointing to |anchor| with |shelf_view| as its content.
   void Show(views::View* anchor, ShelfView* shelf_view);
 
   void Hide();
 
   // This method as name indicates will hide bubble and schedule paint
   // for overflow button.
   void HideBubbleAndRefreshButton();
 
   bool IsShowing() const { return !!bubble_; }
   ShelfView* shelf_view() { return shelf_view_; }
   OverflowBubbleView* bubble_view() { return bubble_; }
 
  private:
-  void ProcessPressedEvent(ui::LocatedEvent* event);
+  void ProcessPressedEvent(const gfx::Point& event_location_in_screen);
 
-  // Overridden from ui::EventHandler:
-  void OnMouseEvent(ui::MouseEvent* event) override;
-  void OnTouchEvent(ui::TouchEvent* event) override;
+  // views::PointerWatcher:
+  void OnMousePressed(const ui::MouseEvent& event,
+                      const gfx::Point& location_in_screen) override;
+  void OnTouchPressed(const ui::TouchEvent& event,
+                      const gfx::Point& location_in_screen) override;
 
   // Overridden from views::WidgetObserver:
   void OnWidgetDestroying(views::Widget* widget) override;
 
   OverflowBubbleView* bubble_;  // Owned by views hierarchy.
   views::View* anchor_;  // Owned by ShelfView.
   ShelfView* shelf_view_;  // Owned by |bubble_|.
 
   DISALLOW_COPY_AND_ASSIGN(OverflowBubble);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_OVERFLOW_BUBBLE_H_