OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/common/shelf/overflow_bubble.h" | 5 #include "ash/common/shelf/overflow_bubble.h" |
6 | 6 |
7 #include "ash/common/shelf/overflow_bubble_view.h" | 7 #include "ash/common/shelf/overflow_bubble_view.h" |
8 #include "ash/common/shelf/wm_shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
9 #include "ash/common/system/tray/tray_background_view.h" | 9 #include "ash/common/system/tray/tray_background_view.h" |
10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 | 64 |
65 void OverflowBubble::ProcessPressedEvent( | 65 void OverflowBubble::ProcessPressedEvent( |
66 const gfx::Point& event_location_in_screen) { | 66 const gfx::Point& event_location_in_screen) { |
67 if (IsShowing() && !shelf_view_->IsShowingMenu() && | 67 if (IsShowing() && !shelf_view_->IsShowingMenu() && |
68 !bubble_->GetBoundsInScreen().Contains(event_location_in_screen) && | 68 !bubble_->GetBoundsInScreen().Contains(event_location_in_screen) && |
69 !anchor_->GetBoundsInScreen().Contains(event_location_in_screen)) { | 69 !anchor_->GetBoundsInScreen().Contains(event_location_in_screen)) { |
70 HideBubbleAndRefreshButton(); | 70 HideBubbleAndRefreshButton(); |
71 } | 71 } |
72 } | 72 } |
73 | 73 |
74 void OverflowBubble::OnMousePressed(const ui::MouseEvent& event, | 74 void OverflowBubble::OnPointerEventObserved( |
75 const gfx::Point& location_in_screen, | 75 const ui::LocatedEvent& event, |
76 views::Widget* target) { | 76 const gfx::Point& location_in_screen, |
77 ProcessPressedEvent(location_in_screen); | 77 views::Widget* target) { |
78 } | 78 if (event.type() == ui::ET_MOUSE_PRESSED || |
79 | 79 event.type() == ui::ET_TOUCH_PRESSED) |
80 void OverflowBubble::OnTouchPressed(const ui::TouchEvent& event, | 80 ProcessPressedEvent(location_in_screen); |
81 const gfx::Point& location_in_screen, | |
82 views::Widget* target) { | |
83 ProcessPressedEvent(location_in_screen); | |
84 } | 81 } |
85 | 82 |
86 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { | 83 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) { |
87 DCHECK(widget == bubble_->GetWidget()); | 84 DCHECK(widget == bubble_->GetWidget()); |
88 bubble_ = NULL; | 85 bubble_ = NULL; |
89 anchor_ = NULL; | 86 anchor_ = NULL; |
90 wm_shelf_->SchedulePaint(); | 87 wm_shelf_->SchedulePaint(); |
91 shelf_view_ = NULL; | 88 shelf_view_ = NULL; |
92 } | 89 } |
93 | 90 |
94 } // namespace ash | 91 } // namespace ash |
OLD | NEW |