Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Unified Diff: ash/launcher/overflow_bubble.cc

Issue 10824295: Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher_button.cc ('k') | ash/system/tray/tray_notification_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/overflow_bubble.cc
===================================================================
--- ash/launcher/overflow_bubble.cc (revision 151481)
+++ ash/launcher/overflow_bubble.cc (working copy)
@@ -75,8 +75,8 @@
virtual gfx::Size GetPreferredSize() OVERRIDE;
virtual void Layout() OVERRIDE;
virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
- virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE;
- virtual bool OnScrollEvent(const views::ScrollEvent & event) OVERRIDE;
+ virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
+ virtual bool OnScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
// views::BubbleDelegate overrides:
virtual gfx::Rect GetBubbleBounds() OVERRIDE;
@@ -178,7 +178,7 @@
SizeToContents();
}
-bool OverflowBubbleView::OnMouseWheel(const views::MouseWheelEvent& event) {
+bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) {
if (is_horizontal_alignment())
ScrollByXOffset(-event.offset());
else
@@ -188,7 +188,7 @@
return true;
}
-bool OverflowBubbleView::OnScrollEvent(const views::ScrollEvent & event) {
+bool OverflowBubbleView::OnScrollEvent(const ui::ScrollEvent& event) {
ScrollByXOffset(-event.x_offset());
ScrollByYOffset(-event.y_offset());
Layout();
« no previous file with comments | « ash/launcher/launcher_button.cc ('k') | ash/system/tray/tray_notification_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698