| Index: ash/common/shelf/overflow_bubble.cc
|
| diff --git a/ash/common/shelf/overflow_bubble.cc b/ash/common/shelf/overflow_bubble.cc
|
| index 0a5428ab3d96e75b88fbd295f1dc538efe66bdd2..97a5749e6f1e16237b529dd19fee593e4064a564 100644
|
| --- a/ash/common/shelf/overflow_bubble.cc
|
| +++ b/ash/common/shelf/overflow_bubble.cc
|
| @@ -71,16 +71,13 @@ void OverflowBubble::ProcessPressedEvent(
|
| }
|
| }
|
|
|
| -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) {
|
|
|