NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

ash/common/shelf/overflow_bubble.cc

 // 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.
 
 #include "ash/common/shelf/overflow_bubble.h"
 
 #include "ash/common/shelf/overflow_bubble_view.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/tray/tray_background_view.h"
 #include "ash/common/wm_shell.h"
@@ skipping 53 matching lines @@
 
 void OverflowBubble::ProcessPressedEvent(
     const gfx::Point& event_location_in_screen) {
   if (IsShowing() && !shelf_view_->IsShowingMenu() &&
       !bubble_->GetBoundsInScreen().Contains(event_location_in_screen) &&
       !anchor_->GetBoundsInScreen().Contains(event_location_in_screen)) {
     HideBubbleAndRefreshButton();
   }
 }
 
-void OverflowBubble::OnMousePressed(const ui::MouseEvent& event,
-                                    const gfx::Point& location_in_screen,
-                                    views::Widget* target) {
-  ProcessPressedEvent(location_in_screen);
-}
-
-void OverflowBubble::OnTouchPressed(const ui::TouchEvent& event,
-                                    const gfx::Point& location_in_screen,
-                                    views::Widget* target) {
-  ProcessPressedEvent(location_in_screen);
+void OverflowBubble::OnPointerEventObserved(
+    const ui::LocatedEvent& event,
+    const gfx::Point& location_in_screen,
+    views::Widget* target) {
+  if (event.type() == ui::ET_MOUSE_PRESSED ||
+      event.type() == ui::ET_TOUCH_PRESSED)
+    ProcessPressedEvent(location_in_screen);
 }
 
 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
   anchor_ = NULL;
   wm_shelf_->SchedulePaint();
   shelf_view_ = NULL;
 }
 
 }  // namespace ash