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

Unified Diff: ui/views/controls/button/menu_button.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/menu_button.h ('k') | ui/views/controls/button/radio_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/menu_button.cc
===================================================================
--- ui/views/controls/button/menu_button.cc (revision 151406)
+++ ui/views/controls/button/menu_button.cc (working copy)
@@ -177,7 +177,7 @@
return kViewClassName;
}
-bool MenuButton::OnMousePressed(const MouseEvent& event) {
+bool MenuButton::OnMousePressed(const ui::MouseEvent& event) {
RequestFocus();
if (state() != BS_DISABLED) {
// If we're draggable (GetDragOperations returns a non-zero value), then
@@ -195,7 +195,7 @@
return true;
}
-void MenuButton::OnMouseReleased(const MouseEvent& event) {
+void MenuButton::OnMouseReleased(const ui::MouseEvent& event) {
// Explicitly test for left mouse button to show the menu. If we tested for
// !IsTriggerableEvent it could lead to a situation where we end up showing
// the menu and context menu (this would happen if the right button is not
@@ -214,7 +214,7 @@
// BaseButton::OnMouseExited will get the event and will set the button's state
// to BS_NORMAL instead of keeping the state BM_PUSHED. This, in turn, will
// cause the button to appear depressed while the menu is displayed.
-void MenuButton::OnMouseExited(const MouseEvent& event) {
+void MenuButton::OnMouseExited(const ui::MouseEvent& event) {
if ((state_ != BS_DISABLED) && (!menu_visible_) && (!InDrag())) {
SetState(BS_NORMAL);
}
« no previous file with comments | « ui/views/controls/button/menu_button.h ('k') | ui/views/controls/button/radio_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698