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

Unified Diff: ui/views/controls/button/button_dropdown.cc

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (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 | « ui/views/controls/button/button_dropdown.h ('k') | ui/views/controls/button/custom_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/button_dropdown.cc
===================================================================
--- ui/views/controls/button/button_dropdown.cc (revision 151406)
+++ ui/views/controls/button/button_dropdown.cc (working copy)
@@ -57,7 +57,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-bool ButtonDropDown::OnMousePressed(const MouseEvent& event) {
+bool ButtonDropDown::OnMousePressed(const ui::MouseEvent& event) {
if (enabled() && ShouldShowMenu() &&
IsTriggerableEvent(event) && HitTestPoint(event.location())) {
// Store the y pos of the mouse coordinates so we can use them later to
@@ -75,7 +75,7 @@
return ImageButton::OnMousePressed(event);
}
-bool ButtonDropDown::OnMouseDragged(const MouseEvent& event) {
+bool ButtonDropDown::OnMouseDragged(const ui::MouseEvent& event) {
bool result = ImageButton::OnMouseDragged(event);
if (show_menu_factory_.HasWeakPtrs()) {
@@ -91,7 +91,7 @@
return result;
}
-void ButtonDropDown::OnMouseReleased(const MouseEvent& event) {
+void ButtonDropDown::OnMouseReleased(const ui::MouseEvent& event) {
if (IsTriggerableEvent(event) ||
(event.IsRightMouseButton() && !HitTestPoint(event.location()))) {
ImageButton::OnMouseReleased(event);
@@ -111,7 +111,7 @@
return kViewClassName;
}
-void ButtonDropDown::OnMouseExited(const MouseEvent& event) {
+void ButtonDropDown::OnMouseExited(const ui::MouseEvent& event) {
// Starting a drag results in a MouseExited, we need to ignore it.
// A right click release triggers an exit event. We want to
// remain in a PUSHED state until the drop down menu closes.
« no previous file with comments | « ui/views/controls/button/button_dropdown.h ('k') | ui/views/controls/button/custom_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698