Rename ui::EventFlags mouse flags to be more sensible

Changes EF_(LEFT|MIDDLE|RIGHT)_BUTTON_DOWN to
EF_(LEF|MIDDLE|RIGHT)_MOUSE_BUTTON since these are not
specific to "down" button events.

This is follow up from review http://codereview.chromium.org/8953037

BUG=none
TEST=Compiles.
R=ben@chromium.org

Review URL: http://codereview.chromium.org/9007016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115188 0039d316-1c4b-4281-b951-d872f2087c98

26 files changed, 151 insertions, 133 deletions

diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index ed230a5..62db782 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -122,9 +122,9 @@ void RootWindow::Draw() {
 
 bool RootWindow::DispatchMouseEvent(MouseEvent* event) {
   static const int kMouseButtonFlagMask =
-      ui::EF_LEFT_BUTTON_DOWN |
-      ui::EF_MIDDLE_BUTTON_DOWN |
-      ui::EF_RIGHT_BUTTON_DOWN;
+      ui::EF_LEFT_MOUSE_BUTTON |
+      ui::EF_MIDDLE_MOUSE_BUTTON |
+      ui::EF_RIGHT_MOUSE_BUTTON;
 
   event->UpdateForTransform(layer()->transform());
 
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index e23282e..f20d50e 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -75,7 +75,7 @@ TEST_F(RootWindowTest, DispatchMouseEvent) {
 
   // Send a mouse event to window1.
   gfx::Point point(101, 201);
-  MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_MOUSE_BUTTON);
   RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   // Event was tested for non-client area for the target window.
@@ -105,7 +105,7 @@ TEST_F(RootWindowTest, MouseButtonState) {
   event.reset(new MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
-      ui::EF_LEFT_BUTTON_DOWN));
+      ui::EF_LEFT_MOUSE_BUTTON));
   root_window->DispatchMouseEvent(event.get());
   EXPECT_TRUE(root_window->IsMouseButtonDown());
 
@@ -113,7 +113,7 @@ TEST_F(RootWindowTest, MouseButtonState) {
   event.reset(new MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
-      ui::EF_LEFT_BUTTON_DOWN | ui::EF_RIGHT_BUTTON_DOWN));
+      ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON));
   root_window->DispatchMouseEvent(event.get());
   EXPECT_TRUE(root_window->IsMouseButtonDown());
 
@@ -121,7 +121,7 @@ TEST_F(RootWindowTest, MouseButtonState) {
   event.reset(new MouseEvent(
       ui::ET_MOUSE_RELEASED,
       location,
-      ui::EF_RIGHT_BUTTON_DOWN));
+      ui::EF_RIGHT_MOUSE_BUTTON));
   root_window->DispatchMouseEvent(event.get());
   EXPECT_TRUE(root_window->IsMouseButtonDown());
 
@@ -137,7 +137,7 @@ TEST_F(RootWindowTest, MouseButtonState) {
   event.reset(new MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
-      ui::EF_MIDDLE_BUTTON_DOWN));
+      ui::EF_MIDDLE_MOUSE_BUTTON));
   root_window->DispatchMouseEvent(event.get());
   EXPECT_TRUE(root_window->IsMouseButtonDown());
 }
diff --git a/ui/aura/test/event_generator.cc b/ui/aura/test/event_generator.cc
index 573665f..200d4ef 100644
--- a/ui/aura/test/event_generator.cc
+++ b/ui/aura/test/event_generator.cc
@@ -38,16 +38,16 @@ EventGenerator::~EventGenerator() {
 }
 
 void EventGenerator::PressLeftButton() {
-  if ((flags_ & ui::EF_LEFT_BUTTON_DOWN) == 0) {
-    flags_ |= ui::EF_LEFT_BUTTON_DOWN;
+  if ((flags_ & ui::EF_LEFT_MOUSE_BUTTON) == 0) {
+    flags_ |= ui::EF_LEFT_MOUSE_BUTTON;
     MouseEvent mouseev(ui::ET_MOUSE_PRESSED, current_location_, flags_);
     Dispatch(mouseev);
   }
 }
 
 void EventGenerator::ReleaseLeftButton() {
-  if (flags_ & ui::EF_LEFT_BUTTON_DOWN) {
-    flags_ ^= ui::EF_LEFT_BUTTON_DOWN;
+  if (flags_ & ui::EF_LEFT_MOUSE_BUTTON) {
+    flags_ ^= ui::EF_LEFT_MOUSE_BUTTON;
     MouseEvent mouseev(ui::ET_MOUSE_RELEASED, current_location_, 0);
     Dispatch(mouseev);
   }
@@ -66,7 +66,7 @@ void EventGenerator::DoubleClickLeftButton() {
 }
 
 void EventGenerator::MoveMouseTo(const gfx::Point& point) {
-  if (flags_ & ui::EF_LEFT_BUTTON_DOWN ) {
+  if (flags_ & ui::EF_LEFT_MOUSE_BUTTON ) {
     MouseEvent middle(
         ui::ET_MOUSE_DRAGGED, current_location_.Middle(point), flags_);
     Dispatch(middle);
diff --git a/ui/aura_shell/drag_drop_controller_unittest.cc b/ui/aura_shell/drag_drop_controller_unittest.cc
index fab1b590..7e55f97 100644
--- a/ui/aura_shell/drag_drop_controller_unittest.cc
+++ b/ui/aura_shell/drag_drop_controller_unittest.cc
@@ -206,7 +206,9 @@ TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
-  aura::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
+  aura::MouseEvent event1(ui::ET_MOUSE_PRESSED,
+                          point,
+                          ui::EF_LEFT_MOUSE_BUTTON);
   aura::RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   int num_drags = 17;
@@ -218,8 +220,9 @@ TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
     if (i > 0)
       UpdateDragData(&data);
     point.Offset(0, 1);
-    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
-        ui::EF_LEFT_BUTTON_DOWN);
+    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
+                                point,
+                                ui::EF_LEFT_MOUSE_BUTTON);
     aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
@@ -253,7 +256,9 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsSingleWidgetTest) {
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
-  aura::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
+  aura::MouseEvent event1(ui::ET_MOUSE_PRESSED,
+                          point,
+                          ui::EF_LEFT_MOUSE_BUTTON);
   aura::RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   int num_drags = drag_view1->width();
@@ -265,8 +270,9 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsSingleWidgetTest) {
     if (i > 0)
       UpdateDragData(&data);
     point.Offset(1, 0);
-    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
-        ui::EF_LEFT_BUTTON_DOWN);
+    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
+                                point,
+                                ui::EF_LEFT_MOUSE_BUTTON);
     aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
@@ -314,7 +320,9 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsMultipleWidgetsTest) {
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
-  aura::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
+  aura::MouseEvent event1(ui::ET_MOUSE_PRESSED,
+                          point,
+                          ui::EF_LEFT_MOUSE_BUTTON);
   aura::RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   int num_drags = drag_view1->width();
@@ -326,8 +334,9 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsMultipleWidgetsTest) {
     if (i > 0)
       UpdateDragData(&data);
     point.Offset(1, 0);
-    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
-        ui::EF_LEFT_BUTTON_DOWN);
+    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
+                                point,
+                                ui::EF_LEFT_MOUSE_BUTTON);
     aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
@@ -368,7 +377,9 @@ TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) {
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
 
-  aura::MouseEvent event1(ui::ET_MOUSE_PRESSED, point, ui::EF_LEFT_BUTTON_DOWN);
+  aura::MouseEvent event1(ui::ET_MOUSE_PRESSED,
+                          point,
+                          ui::EF_LEFT_MOUSE_BUTTON);
   aura::RootWindow::GetInstance()->DispatchMouseEvent(&event1);
 
   int num_drags_1 = 17;
@@ -380,8 +391,9 @@ TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) {
     if (i > 0)
       UpdateDragData(&data);
     point.Offset(0, 1);
-    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
-        ui::EF_LEFT_BUTTON_DOWN);
+    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
+                                point,
+                                ui::EF_LEFT_MOUSE_BUTTON);
     aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
@@ -391,8 +403,9 @@ TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) {
   for (int i = 0; i < num_drags_2; ++i) {
     UpdateDragData(&data);
     point.Offset(0, 1);
-    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, point,
-        ui::EF_LEFT_BUTTON_DOWN);
+    aura::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED,
+                                point,
+                                ui::EF_LEFT_MOUSE_BUTTON);
     aura::RootWindow::GetInstance()->DispatchMouseEvent(&drag_event);
   }
 
diff --git a/ui/aura_shell/root_window_event_filter_unittest.cc b/ui/aura_shell/root_window_event_filter_unittest.cc
index b8e1821..533867a 100644
--- a/ui/aura_shell/root_window_event_filter_unittest.cc
+++ b/ui/aura_shell/root_window_event_filter_unittest.cc
@@ -95,8 +95,9 @@ TEST_F(RootWindowEventFilterTest, Focus) {
   // Click on a sub-window (w121) to focus it.
   gfx::Point click_point = w121->bounds().CenterPoint();
   aura::Window::ConvertPointToWindow(w121->parent(), root_window, &click_point);
-  aura::MouseEvent mouse(ui::ET_MOUSE_PRESSED, click_point,
-                         ui::EF_LEFT_BUTTON_DOWN);
+  aura::MouseEvent mouse(ui::ET_MOUSE_PRESSED,
+                         click_point,
+                         ui::EF_LEFT_MOUSE_BUTTON);
   root_window->DispatchMouseEvent(&mouse);
   aura::internal::FocusManager* focus_manager = w121->GetFocusManager();
   EXPECT_EQ(w121.get(), focus_manager->GetFocusedWindow());
@@ -358,19 +359,19 @@ TEST_F(RootWindowEventFilterTest, TransformActivate) {
   transform.TransformPoint(miss_point);
   aura::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
                             miss_point,
-                            ui::EF_LEFT_BUTTON_DOWN);
+                            ui::EF_LEFT_MOUSE_BUTTON);
   root_window->DispatchMouseEvent(&mouseev1);
   EXPECT_FALSE(w1->GetFocusManager()->GetFocusedWindow());
   aura::MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
                            miss_point,
-                           ui::EF_LEFT_BUTTON_DOWN);
+                           ui::EF_LEFT_MOUSE_BUTTON);
   root_window->DispatchMouseEvent(&mouseup);
 
   gfx::Point hit_point(5, 15);
   transform.TransformPoint(hit_point);
   aura::MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
                             hit_point,
-                            ui::EF_LEFT_BUTTON_DOWN);
+                            ui::EF_LEFT_MOUSE_BUTTON);
   root_window->DispatchMouseEvent(&mouseev2);
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), w1->GetFocusManager()->GetFocusedWindow());
diff --git a/ui/base/cocoa/events_mac.mm b/ui/base/cocoa/events_mac.mm
index 763e5a6..2d406e8 100644
--- a/ui/base/cocoa/events_mac.mm
+++ b/ui/base/cocoa/events_mac.mm
@@ -87,19 +87,19 @@ int EventFlagsFromNative(const base::NativeEvent& native_event) {
   if (type == NSLeftMouseDown ||
       type == NSLeftMouseUp ||
       type == NSLeftMouseDragged) {
-    event_flags = event_flags | EF_LEFT_BUTTON_DOWN;
+    event_flags = event_flags | EF_LEFT_MOUSE_BUTTON;
   }
 
   if (type == NSRightMouseDown ||
       type == NSRightMouseUp ||
       type == NSRightMouseDragged) {
-    event_flags = event_flags | EF_RIGHT_BUTTON_DOWN;
+    event_flags = event_flags | EF_RIGHT_MOUSE_BUTTON;
   }
 
   if (type == NSOtherMouseDown ||
       type == NSOtherMouseUp ||
       type == NSOtherMouseDragged) {
-    event_flags = event_flags | EF_MIDDLE_BUTTON_DOWN;
+    event_flags = event_flags | EF_MIDDLE_MOUSE_BUTTON;
   }
 
   return event_flags;
diff --git a/ui/base/cocoa/events_mac_unittest.mm b/ui/base/cocoa/events_mac_unittest.mm
index ccb05dd..eb4e159 100644
--- a/ui/base/cocoa/events_mac_unittest.mm
+++ b/ui/base/cocoa/events_mac_unittest.mm
@@ -134,17 +134,17 @@ TEST_F(EventsMacTest, EventFlagsFromNative) {
   // Left mouse flags.
   native_event = MouseEventWithType(NSLeftMouseDown, 0);
   flags = ui::EventFlagsFromNative(native_event);
-  EXPECT_EQ(ui::EF_LEFT_BUTTON_DOWN, flags);
+  EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, flags);
 
   // Right mouse flags.
   native_event = MouseEventWithType(NSRightMouseDown, 0);
   flags = ui::EventFlagsFromNative(native_event);
-  EXPECT_EQ(ui::EF_RIGHT_BUTTON_DOWN, flags);
+  EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, flags);
 
   // Center mouse flags.
   native_event = MouseEventWithType(NSOtherMouseDown, 0);
   flags = ui::EventFlagsFromNative(native_event);
-  EXPECT_EQ(ui::EF_MIDDLE_BUTTON_DOWN, flags);
+  EXPECT_EQ(ui::EF_MIDDLE_MOUSE_BUTTON, flags);
 }
 
 TEST_F(EventsMacTest, EventLocationFromNative) {
diff --git a/ui/base/events.h b/ui/base/events.h
index 539f922..a0bb7a8 100644
--- a/ui/base/events.h
+++ b/ui/base/events.h
@@ -40,15 +40,15 @@ enum EventType {
 
 // Event flags currently supported
 enum EventFlags {
-  EF_CAPS_LOCK_DOWN     = 1 << 0,
-  EF_SHIFT_DOWN         = 1 << 1,
-  EF_CONTROL_DOWN       = 1 << 2,
-  EF_ALT_DOWN           = 1 << 3,
-  EF_LEFT_BUTTON_DOWN   = 1 << 4,
-  EF_MIDDLE_BUTTON_DOWN = 1 << 5,
-  EF_RIGHT_BUTTON_DOWN  = 1 << 6,
-  EF_COMMAND_DOWN       = 1 << 7,  // Only useful on OSX
-  EF_EXTENDED           = 1 << 8,  // Windows extended key (see WM_KEYDOWN doc)
+  EF_CAPS_LOCK_DOWN      = 1 << 0,
+  EF_SHIFT_DOWN          = 1 << 1,
+  EF_CONTROL_DOWN        = 1 << 2,
+  EF_ALT_DOWN            = 1 << 3,
+  EF_LEFT_MOUSE_BUTTON   = 1 << 4,
+  EF_MIDDLE_MOUSE_BUTTON = 1 << 5,
+  EF_RIGHT_MOUSE_BUTTON  = 1 << 6,
+  EF_COMMAND_DOWN        = 1 << 7,  // Only useful on OSX
+  EF_EXTENDED            = 1 << 8,  // Windows extended key (see WM_KEYDOWN doc)
 };
 
 // Flags specific to mouse events
diff --git a/ui/base/ime/input_method_ibus.cc b/ui/base/ime/input_method_ibus.cc
index afc657e..441e713 100644
--- a/ui/base/ime/input_method_ibus.cc
+++ b/ui/base/ime/input_method_ibus.cc
@@ -41,9 +41,9 @@ int EventFlagsFromIBusState(guint32 state) {
          (state & IBUS_CONTROL_MASK ? ui::EF_CONTROL_DOWN : 0) |
          (state & IBUS_SHIFT_MASK ? ui::EF_SHIFT_DOWN : 0) |
          (state & IBUS_MOD1_MASK ? ui::EF_ALT_DOWN : 0) |
-         (state & IBUS_BUTTON1_MASK ? ui::EF_LEFT_BUTTON_DOWN : 0) |
-         (state & IBUS_BUTTON2_MASK ? ui::EF_MIDDLE_BUTTON_DOWN : 0) |
-         (state & IBUS_BUTTON3_MASK ? ui::EF_RIGHT_BUTTON_DOWN : 0);
+         (state & IBUS_BUTTON1_MASK ? ui::EF_LEFT_MOUSE_BUTTON : 0) |
+         (state & IBUS_BUTTON2_MASK ? ui::EF_MIDDLE_MOUSE_BUTTON : 0) |
+         (state & IBUS_BUTTON3_MASK ? ui::EF_RIGHT_MOUSE_BUTTON : 0);
 }
 
 // Converts X flags to ibus key state flags.
diff --git a/ui/base/wayland/events_wayland.cc b/ui/base/wayland/events_wayland.cc
index a52a93b..cec7c49 100644
--- a/ui/base/wayland/events_wayland.cc
+++ b/ui/base/wayland/events_wayland.cc
@@ -45,11 +45,11 @@ int GetEventFlagsFromState(unsigned int state) {
   if (state & LockMask)
     flags |= ui::EF_CAPS_LOCK_DOWN;
   if (state & Button1Mask)
-    flags |= ui::EF_LEFT_BUTTON_DOWN;
+    flags |= ui::EF_LEFT_MOUSE_BUTTON;
   if (state & Button2Mask)
-    flags |= ui::EF_MIDDLE_BUTTON_DOWN;
+    flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
   if (state & Button3Mask)
-    flags |= ui::EF_RIGHT_BUTTON_DOWN;
+    flags |= ui::EF_RIGHT_MOUSE_BUTTON;
 
   return flags;
 }
@@ -59,11 +59,11 @@ int GetButtonEventFlagsFromNativeEvent(const base::NativeEvent& native_event) {
   int flags = 0;
   switch (native_event->button.button) {
     case ui::LEFT_BUTTON:
-      return flags | ui::EF_LEFT_BUTTON_DOWN;
+      return flags | ui::EF_LEFT_MOUSE_BUTTON;
     case ui::MIDDLE_BUTTON:
-      return flags | ui::EF_MIDDLE_BUTTON_DOWN;
+      return flags | ui::EF_MIDDLE_MOUSE_BUTTON;
     case ui::RIGHT_BUTTON:
-      return flags | ui::EF_RIGHT_BUTTON_DOWN;
+      return flags | ui::EF_RIGHT_MOUSE_BUTTON;
   }
   return flags;
 }
diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc
index c745526..924c82e 100644
--- a/ui/base/win/events_win.cc
+++ b/ui/base/win/events_win.cc
@@ -126,9 +126,9 @@ int MouseStateFlagsFromNative(const base::NativeEvent& native_event) {
     win_flags |= GET_KEYSTATE_WPARAM(native_event.wParam);
 
   int flags = 0;
-  flags |= (win_flags & MK_LBUTTON) ? ui::EF_LEFT_BUTTON_DOWN : 0;
-  flags |= (win_flags & MK_MBUTTON) ? ui::EF_MIDDLE_BUTTON_DOWN : 0;
-  flags |= (win_flags & MK_RBUTTON) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
+  flags |= (win_flags & MK_LBUTTON) ? ui::EF_LEFT_MOUSE_BUTTON : 0;
+  flags |= (win_flags & MK_MBUTTON) ? ui::EF_MIDDLE_MOUSE_BUTTON : 0;
+  flags |= (win_flags & MK_RBUTTON) ? ui::EF_RIGHT_MOUSE_BUTTON : 0;
   flags |= IsDoubleClickMouseEvent(native_event) ? ui::EF_IS_DOUBLE_CLICK: 0;
   flags |= IsNonClientMouseEvent(native_event) ? ui::EF_IS_NON_CLIENT : 0;
   return flags;
diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc
index b5c8bed..877b07f 100644
--- a/ui/base/x/events_x.cc
+++ b/ui/base/x/events_x.cc
@@ -170,11 +170,11 @@ int GetEventFlagsFromXState(unsigned int state) {
   if (state & LockMask)
     flags |= ui::EF_CAPS_LOCK_DOWN;
   if (state & Button1Mask)
-    flags |= ui::EF_LEFT_BUTTON_DOWN;
+    flags |= ui::EF_LEFT_MOUSE_BUTTON;
   if (state & Button2Mask)
-    flags |= ui::EF_MIDDLE_BUTTON_DOWN;
+    flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
   if (state & Button3Mask)
-    flags |= ui::EF_RIGHT_BUTTON_DOWN;
+    flags |= ui::EF_RIGHT_MOUSE_BUTTON;
   return flags;
 }
 
@@ -189,11 +189,11 @@ int GetEventFlagsFromXState(unsigned int state) {
 int GetEventFlagsForButton(int button) {
   switch (button) {
     case 1:
-      return ui::EF_LEFT_BUTTON_DOWN;
+      return ui::EF_LEFT_MOUSE_BUTTON;
     case 2:
-      return ui::EF_MIDDLE_BUTTON_DOWN;
+      return ui::EF_MIDDLE_MOUSE_BUTTON;
     case 3:
-      return ui::EF_RIGHT_BUTTON_DOWN;
+      return ui::EF_RIGHT_MOUSE_BUTTON;
     default:
       return 0;
   }
diff --git a/ui/base/x/events_x_unittest.cc b/ui/base/x/events_x_unittest.cc
index 2419ff6..9545a13 100644
--- a/ui/base/x/events_x_unittest.cc
+++ b/ui/base/x/events_x_unittest.cc
@@ -44,13 +44,13 @@ TEST(EventsXTest, ButtonEvents) {
 
   InitButtonEvent(&event, true, location, 1, 0);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, ui::EventTypeFromNative(&event));
-  EXPECT_EQ(ui::EF_LEFT_BUTTON_DOWN, ui::EventFlagsFromNative(&event));
+  EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, ui::EventFlagsFromNative(&event));
   EXPECT_EQ(location, ui::EventLocationFromNative(&event));
   EXPECT_TRUE(ui::IsMouseEvent(&event));
 
   InitButtonEvent(&event, true, location, 2, Button1Mask | ShiftMask);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, ui::EventTypeFromNative(&event));
-  EXPECT_EQ(ui::EF_LEFT_BUTTON_DOWN | ui::EF_MIDDLE_BUTTON_DOWN |
+  EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON |
                 ui::EF_SHIFT_DOWN,
             ui::EventFlagsFromNative(&event));
   EXPECT_EQ(location, ui::EventLocationFromNative(&event));
@@ -58,7 +58,7 @@ TEST(EventsXTest, ButtonEvents) {
 
   InitButtonEvent(&event, false, location, 3, 0);
   EXPECT_EQ(ui::ET_MOUSE_RELEASED, ui::EventTypeFromNative(&event));
-  EXPECT_EQ(ui::EF_RIGHT_BUTTON_DOWN, ui::EventFlagsFromNative(&event));
+  EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, ui::EventFlagsFromNative(&event));
   EXPECT_EQ(location, ui::EventLocationFromNative(&event));
   EXPECT_TRUE(ui::IsMouseEvent(&event));
 
diff --git a/ui/views/controls/button/button_dropdown.cc b/ui/views/controls/button/button_dropdown.cc
index 83afae8..7ac0ac4 100644
--- a/ui/views/controls/button/button_dropdown.cc
+++ b/ui/views/controls/button/button_dropdown.cc
@@ -126,8 +126,8 @@ void ButtonDropDown::GetAccessibleState(ui::AccessibleViewState* state) {
 bool ButtonDropDown::ShouldEnterPushedState(const MouseEvent& event) {
   // Enter PUSHED state on press with Left or Right mouse button. Remain
   // in this state while the context menu is open.
-  return ((ui::EF_LEFT_BUTTON_DOWN |
-      ui::EF_RIGHT_BUTTON_DOWN) & event.flags()) != 0;
+  return ((ui::EF_LEFT_MOUSE_BUTTON |
+      ui::EF_RIGHT_MOUSE_BUTTON) & event.flags()) != 0;
 }
 
 void ButtonDropDown::ShowDropDownMenu(gfx::NativeView window) {
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 78b59e1..74535ba 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -253,7 +253,7 @@ CustomButton::CustomButton(ButtonListener* listener)
       state_(BS_NORMAL),
       animate_on_state_change_(true),
       is_throbbing_(false),
-      triggerable_event_flags_(ui::EF_LEFT_BUTTON_DOWN),
+      triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
       request_focus_on_press_(true) {
   hover_animation_.reset(new ui::ThrobAnimation(this));
   hover_animation_->SetSlideDuration(kHoverFadeDurationMs);
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 56e97f9..bb40b61 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -546,7 +546,7 @@ void MenuController::OnMouseReleased(SubmenuView* source,
   // contents of the folder.
   if (!part.is_scroll() && part.menu &&
       !(part.menu->HasSubmenu() &&
-        (event.flags() == ui::EF_LEFT_BUTTON_DOWN))) {
+        (event.flags() == ui::EF_LEFT_MOUSE_BUTTON))) {
     if (active_mouse_view_) {
       SendMouseReleaseToActiveView(source, event);
       return;
diff --git a/ui/views/controls/menu/menu_model_adapter.cc b/ui/views/controls/menu/menu_model_adapter.cc
index 759fda3..450a579 100644
--- a/ui/views/controls/menu/menu_model_adapter.cc
+++ b/ui/views/controls/menu/menu_model_adapter.cc
@@ -14,8 +14,8 @@ namespace views {
 
 MenuModelAdapter::MenuModelAdapter(ui::MenuModel* menu_model)
     : menu_model_(menu_model),
-      triggerable_event_flags_(ui::EF_LEFT_BUTTON_DOWN |
-                               ui::EF_RIGHT_BUTTON_DOWN) {
+      triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON |
+                               ui::EF_RIGHT_MOUSE_BUTTON) {
   DCHECK(menu_model);
 }
 
diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.cc b/ui/views/controls/scrollbar/base_scroll_bar_button.cc
index 565c543..5efef6e 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar_button.cc
+++ b/ui/views/controls/scrollbar/base_scroll_bar_button.cc
@@ -43,7 +43,7 @@ void BaseScrollBarButton::RepeaterNotifyClick() {
 #endif
   views::MouseEvent event(ui::ET_MOUSE_RELEASED,
                           cursor_point.x(), cursor_point.y(),
-                          ui::EF_LEFT_BUTTON_DOWN);
+                          ui::EF_LEFT_MOUSE_BUTTON);
   Button::NotifyClick(event);
 }
 
diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
index 04fdeb1..f0a8db3 100644
--- a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -82,7 +82,7 @@ class AutorepeatButton : public ImageButton {
 #endif
     views::MouseEvent event(ui::ET_MOUSE_RELEASED,
                             cursor_point.x(), cursor_point.y(),
-                            ui::EF_LEFT_BUTTON_DOWN);
+                            ui::EF_LEFT_MOUSE_BUTTON);
     Button::NotifyClick(event);
   }
 
diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
index 21213d2..7b654d2 100644
--- a/ui/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc
@@ -295,19 +295,19 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
   void MouseClick(const gfx::Rect bound, int x_offset) {
     int x = bound.x() +  x_offset;
     int y = bound.y() + bound.height() / 2;
-    MouseEvent click(ui::ET_MOUSE_PRESSED, x, y, ui::EF_LEFT_BUTTON_DOWN);
+    MouseEvent click(ui::ET_MOUSE_PRESSED, x, y, ui::EF_LEFT_MOUSE_BUTTON);
     textfield_view_->OnMousePressed(click);
-    MouseEvent release(ui::ET_MOUSE_RELEASED, x, y, ui::EF_LEFT_BUTTON_DOWN);
+    MouseEvent release(ui::ET_MOUSE_RELEASED, x, y, ui::EF_LEFT_MOUSE_BUTTON);
     textfield_view_->OnMouseReleased(release);
   }
 
   // This is to avoid double/triple click.
   void NonClientMouseClick() {
     MouseEvent click(ui::ET_MOUSE_PRESSED, 0, 0,
-                     ui::EF_LEFT_BUTTON_DOWN | ui::EF_IS_NON_CLIENT);
+                     ui::EF_LEFT_MOUSE_BUTTON | ui::EF_IS_NON_CLIENT);
     textfield_view_->OnMousePressed(click);
     MouseEvent release(ui::ET_MOUSE_RELEASED, 0, 0,
-                       ui::EF_LEFT_BUTTON_DOWN | ui::EF_IS_NON_CLIENT);
+                       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_IS_NON_CLIENT);
     textfield_view_->OnMouseReleased(release);
   }
 
@@ -669,7 +669,7 @@ TEST_F(NativeTextfieldViewsTest, FocusTraversalTest) {
   // Test if clicking on textfield view sets the focus to textfield_.
   widget_->GetFocusManager()->AdvanceFocus(true);
   EXPECT_EQ(3, GetFocusedView()->id());
-  MouseEvent click(ui::ET_MOUSE_PRESSED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent click(ui::ET_MOUSE_PRESSED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
   textfield_view_->OnMousePressed(click);
   EXPECT_EQ(1, GetFocusedView()->id());
 }
@@ -687,10 +687,10 @@ TEST_F(NativeTextfieldViewsTest, ContextMenuDisplayTest) {
 TEST_F(NativeTextfieldViewsTest, DoubleAndTripleClickTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));
-  MouseEvent click(ui::ET_MOUSE_PRESSED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
-  MouseEvent release(ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent click(ui::ET_MOUSE_PRESSED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
+  MouseEvent release(ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
   MouseEvent double_click(ui::ET_MOUSE_PRESSED, 0, 0,
-                          ui::EF_LEFT_BUTTON_DOWN | ui::EF_IS_DOUBLE_CLICK);
+                          ui::EF_LEFT_MOUSE_BUTTON | ui::EF_IS_DOUBLE_CLICK);
 
   // Test for double click.
   textfield_view_->OnMousePressed(click);
@@ -716,11 +716,14 @@ TEST_F(NativeTextfieldViewsTest, DragToSelect) {
   textfield_->SetText(ASCIIToUTF16("hello world"));
   const int kStart = GetCursorPositionX(5);
   const int kEnd = 500;
-  MouseEvent click_a(ui::ET_MOUSE_PRESSED, kStart, 0, ui::EF_LEFT_BUTTON_DOWN);
-  MouseEvent click_b(ui::ET_MOUSE_PRESSED, kEnd, 0, ui::EF_LEFT_BUTTON_DOWN);
-  MouseEvent drag_left(ui::ET_MOUSE_DRAGGED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
-  MouseEvent drag_right(ui::ET_MOUSE_DRAGGED, kEnd, 0, ui::EF_LEFT_BUTTON_DOWN);
-  MouseEvent release(ui::ET_MOUSE_RELEASED, kEnd, 0, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent click_a(ui::ET_MOUSE_PRESSED, kStart, 0, ui::EF_LEFT_MOUSE_BUTTON);
+  MouseEvent click_b(ui::ET_MOUSE_PRESSED, kEnd, 0, ui::EF_LEFT_MOUSE_BUTTON);
+  MouseEvent drag_left(ui::ET_MOUSE_DRAGGED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
+  MouseEvent drag_right(ui::ET_MOUSE_DRAGGED,
+                        kEnd,
+                        0,
+                        ui::EF_LEFT_MOUSE_BUTTON);
+  MouseEvent release(ui::ET_MOUSE_RELEASED, kEnd, 0, ui::EF_LEFT_MOUSE_BUTTON);
   textfield_view_->OnMousePressed(click_a);
   EXPECT_TRUE(textfield_->GetSelectedText().empty());
   // Check that dragging left selects the beginning of the string.
@@ -849,7 +852,7 @@ TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_ToTheRight) {
   // Start dragging "ello".
   textfield_->SelectRange(ui::Range(1, 5));
   MouseEvent click_a(ui::ET_MOUSE_PRESSED, GetCursorPositionX(3), 0,
-                     ui::EF_LEFT_BUTTON_DOWN);
+                     ui::EF_LEFT_MOUSE_BUTTON);
   textfield_view_->OnMousePressed(click_a);
   EXPECT_TRUE(textfield_view_->CanStartDragForView(textfield_view_,
                   click_a.location(), gfx::Point()));
@@ -903,7 +906,7 @@ TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_ToTheLeft) {
   // Start dragging " worl".
   textfield_->SelectRange(ui::Range(5, 10));
   MouseEvent click_a(ui::ET_MOUSE_PRESSED, GetCursorPositionX(7), 0,
-                     ui::EF_LEFT_BUTTON_DOWN);
+                     ui::EF_LEFT_MOUSE_BUTTON);
   textfield_view_->OnMousePressed(click_a);
   EXPECT_TRUE(textfield_view_->CanStartDragForView(textfield_view_,
                   click_a.location(), gfx::Point()));
@@ -950,7 +953,7 @@ TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_Canceled) {
   // Start dragging "worl".
   textfield_->SelectRange(ui::Range(6, 10));
   MouseEvent click(ui::ET_MOUSE_PRESSED, GetCursorPositionX(8), 0,
-                   ui::EF_LEFT_BUTTON_DOWN);
+                   ui::EF_LEFT_MOUSE_BUTTON);
   textfield_view_->OnMousePressed(click);
   ui::OSExchangeData data;
   textfield_view_->WriteDragDataForView(NULL, click.location(), &data);
@@ -961,9 +964,9 @@ TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_Canceled) {
   EXPECT_EQ(ui::DragDropTypes::DRAG_MOVE, textfield_view_->OnDragUpdated(drop));
   // "Cancel" the drag, via move and release over the selection, and OnDragDone.
   MouseEvent drag(ui::ET_MOUSE_DRAGGED, GetCursorPositionX(9), 0,
-                  ui::EF_LEFT_BUTTON_DOWN);
+                  ui::EF_LEFT_MOUSE_BUTTON);
   MouseEvent release(ui::ET_MOUSE_RELEASED, GetCursorPositionX(9), 0,
-                     ui::EF_LEFT_BUTTON_DOWN);
+                     ui::EF_LEFT_MOUSE_BUTTON);
   textfield_view_->OnMouseDragged(drag);
   textfield_view_->OnMouseReleased(release);
   textfield_view_->OnDragDone();
diff --git a/ui/views/events/event.cc b/ui/views/events/event.cc
index 5f2d320..af97208 100644
--- a/ui/views/events/event.cc
+++ b/ui/views/events/event.cc
@@ -128,14 +128,14 @@ MouseEvent::MouseEvent(const TouchEvent& touch)
   // MouseEvent from the native event for a TouchEvent, so the flags are
   // explicitly updated as well. The button is approximated from the touchpoint
   // identity.
-  int new_flags = flags() & ~(ui::EF_LEFT_BUTTON_DOWN |
-                              ui::EF_RIGHT_BUTTON_DOWN |
-                              ui::EF_MIDDLE_BUTTON_DOWN);
-  int button = ui::EF_LEFT_BUTTON_DOWN;
+  int new_flags = flags() & ~(ui::EF_LEFT_MOUSE_BUTTON |
+                              ui::EF_RIGHT_MOUSE_BUTTON |
+                              ui::EF_MIDDLE_MOUSE_BUTTON);
+  int button = ui::EF_LEFT_MOUSE_BUTTON;
   if (touch.identity() == 1)
-    button = ui::EF_RIGHT_BUTTON_DOWN;
+    button = ui::EF_RIGHT_MOUSE_BUTTON;
   else if (touch.identity() == 2)
-    button = ui::EF_MIDDLE_BUTTON_DOWN;
+    button = ui::EF_MIDDLE_MOUSE_BUTTON;
   set_flags(new_flags | button);
 }
 
diff --git a/ui/views/events/event.h b/ui/views/events/event.h
index 4d0d2f1..10bee95 100644
--- a/ui/views/events/event.h
+++ b/ui/views/events/event.h
@@ -194,30 +194,30 @@ class VIEWS_EXPORT MouseEvent : public LocatedEvent {
 
   // Conveniences to quickly test what button is down
   bool IsOnlyLeftMouseButton() const {
-    return (flags() & ui::EF_LEFT_BUTTON_DOWN) &&
-      !(flags() & (ui::EF_MIDDLE_BUTTON_DOWN | ui::EF_RIGHT_BUTTON_DOWN));
+    return (flags() & ui::EF_LEFT_MOUSE_BUTTON) &&
+      !(flags() & (ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON));
   }
 
   bool IsLeftMouseButton() const {
-    return (flags() & ui::EF_LEFT_BUTTON_DOWN) != 0;
+    return (flags() & ui::EF_LEFT_MOUSE_BUTTON) != 0;
   }
 
   bool IsOnlyMiddleMouseButton() const {
-    return (flags() & ui::EF_MIDDLE_BUTTON_DOWN) &&
-      !(flags() & (ui::EF_LEFT_BUTTON_DOWN | ui::EF_RIGHT_BUTTON_DOWN));
+    return (flags() & ui::EF_MIDDLE_MOUSE_BUTTON) &&
+      !(flags() & (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON));
   }
 
   bool IsMiddleMouseButton() const {
-    return (flags() & ui::EF_MIDDLE_BUTTON_DOWN) != 0;
+    return (flags() & ui::EF_MIDDLE_MOUSE_BUTTON) != 0;
   }
 
   bool IsOnlyRightMouseButton() const {
-    return (flags() & ui::EF_RIGHT_BUTTON_DOWN) &&
-      !(flags() & (ui::EF_LEFT_BUTTON_DOWN | ui::EF_MIDDLE_BUTTON_DOWN));
+    return (flags() & ui::EF_RIGHT_MOUSE_BUTTON) &&
+      !(flags() & (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON));
   }
 
   bool IsRightMouseButton() const {
-    return (flags() & ui::EF_RIGHT_BUTTON_DOWN) != 0;
+    return (flags() & ui::EF_RIGHT_MOUSE_BUTTON) != 0;
   }
 
  protected:
diff --git a/ui/views/events/event_gtk.cc b/ui/views/events/event_gtk.cc
index 7c67134..5413283 100644
--- a/ui/views/events/event_gtk.cc
+++ b/ui/views/events/event_gtk.cc
@@ -42,9 +42,9 @@ int GetFlagsFromGdkState(unsigned int state) {
   flags |= (state & GDK_CONTROL_MASK) ? ui::EF_CONTROL_DOWN : 0;
   flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : 0;
   flags |= (state & GDK_MOD1_MASK) ? ui::EF_ALT_DOWN : 0;
-  flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_BUTTON_DOWN : 0;
-  flags |= (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_BUTTON_DOWN : 0;
-  flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
+  flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_MOUSE_BUTTON : 0;
+  flags |= (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_MOUSE_BUTTON : 0;
+  flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_MOUSE_BUTTON : 0;
   return flags;
 }
 
@@ -98,11 +98,11 @@ int EventFlagsFromNative(GdkEvent* gdk_event) {
       gdk_event->type == GDK_BUTTON_RELEASE) {
     switch (gdk_event->button.button) {
       case 1:
-        return flags | ui::EF_LEFT_BUTTON_DOWN;
+        return flags | ui::EF_LEFT_MOUSE_BUTTON;
       case 2:
-        return flags | ui::EF_MIDDLE_BUTTON_DOWN;
+        return flags | ui::EF_MIDDLE_MOUSE_BUTTON;
       case 3:
-        return flags | ui::EF_RIGHT_BUTTON_DOWN;
+        return flags | ui::EF_RIGHT_MOUSE_BUTTON;
     }
   }
   return flags;
diff --git a/ui/views/ime/input_method_ibus.cc b/ui/views/ime/input_method_ibus.cc
index a68c74f..8f50875 100644
--- a/ui/views/ime/input_method_ibus.cc
+++ b/ui/views/ime/input_method_ibus.cc
@@ -48,9 +48,9 @@ int EventFlagsFromIBusState(guint32 state) {
          (state & IBUS_CONTROL_MASK ? ui::EF_CONTROL_DOWN : 0) |
          (state & IBUS_SHIFT_MASK ? ui::EF_SHIFT_DOWN : 0) |
          (state & IBUS_MOD1_MASK ? ui::EF_ALT_DOWN : 0) |
-         (state & IBUS_BUTTON1_MASK ? ui::EF_LEFT_BUTTON_DOWN : 0) |
-         (state & IBUS_BUTTON2_MASK ? ui::EF_MIDDLE_BUTTON_DOWN : 0) |
-         (state & IBUS_BUTTON3_MASK ? ui::EF_RIGHT_BUTTON_DOWN : 0);
+         (state & IBUS_BUTTON1_MASK ? ui::EF_LEFT_MOUSE_BUTTON : 0) |
+         (state & IBUS_BUTTON2_MASK ? ui::EF_MIDDLE_MOUSE_BUTTON : 0) |
+         (state & IBUS_BUTTON3_MASK ? ui::EF_RIGHT_MOUSE_BUTTON : 0);
 }
 
 // Converts event flags to ibus key state flags.
@@ -59,9 +59,9 @@ guint32 IBusStateFromEventFlags(int flags) {
          (flags & ui::EF_CONTROL_DOWN ? IBUS_CONTROL_MASK : 0) |
          (flags & ui::EF_SHIFT_DOWN ? IBUS_SHIFT_MASK : 0) |
          (flags & ui::EF_ALT_DOWN ? IBUS_MOD1_MASK : 0) |
-         (flags & ui::EF_LEFT_BUTTON_DOWN ? IBUS_BUTTON1_MASK : 0) |
-         (flags & ui::EF_MIDDLE_BUTTON_DOWN ? IBUS_BUTTON2_MASK : 0) |
-         (flags & ui::EF_RIGHT_BUTTON_DOWN ? IBUS_BUTTON3_MASK : 0);
+         (flags & ui::EF_LEFT_MOUSE_BUTTON ? IBUS_BUTTON1_MASK : 0) |
+         (flags & ui::EF_MIDDLE_MOUSE_BUTTON ? IBUS_BUTTON2_MASK : 0) |
+         (flags & ui::EF_RIGHT_MOUSE_BUTTON ? IBUS_BUTTON3_MASK : 0);
 }
 
 void IBusKeyEventFromViewsKeyEvent(const views::KeyEvent& key,
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index db3664c..8d68d2c 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -344,7 +344,7 @@ TEST_F(ViewTest, MouseEvent) {
   MouseEvent pressed(ui::ET_MOUSE_PRESSED,
                      110,
                      120,
-                     ui::EF_LEFT_BUTTON_DOWN);
+                     ui::EF_LEFT_MOUSE_BUTTON);
   root->OnMousePressed(pressed);
   EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_PRESSED);
   EXPECT_EQ(v2->location_.x(), 10);
@@ -358,7 +358,7 @@ TEST_F(ViewTest, MouseEvent) {
   MouseEvent dragged(ui::ET_MOUSE_DRAGGED,
                      50,
                      40,
-                     ui::EF_LEFT_BUTTON_DOWN);
+                     ui::EF_LEFT_MOUSE_BUTTON);
   root->OnMouseDragged(dragged);
   EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_DRAGGED);
   EXPECT_EQ(v2->location_.x(), -50);
@@ -1485,9 +1485,9 @@ class ButtonDropDownTest : public ViewTest {
 // Ensure that regular clicks on the drop down button still work. (i.e. - the
 // click events are processed and the listener gets the click)
 TEST_F(ButtonDropDownTest, RegularClickTest) {
-  MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_MOUSE_BUTTON);
   MouseEvent release_event(ui::ET_MOUSE_RELEASED, 1, 1,
-                           ui::EF_LEFT_BUTTON_DOWN);
+                           ui::EF_LEFT_MOUSE_BUTTON);
   button_as_view_->OnMousePressed(press_event);
   button_as_view_->OnMouseReleased(release_event);
   EXPECT_EQ(test_dialog_->last_pressed_button_, test_dialog_->button_drop_);
@@ -1745,7 +1745,7 @@ TEST_F(ViewTest, TransformEvent) {
 
   MouseEvent pressed(ui::ET_MOUSE_PRESSED,
                      110, 210,
-                     ui::EF_LEFT_BUTTON_DOWN);
+                     ui::EF_LEFT_MOUSE_BUTTON);
   root->OnMousePressed(pressed);
   EXPECT_EQ(0, v1->last_mouse_event_type_);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
@@ -1769,7 +1769,7 @@ TEST_F(ViewTest, TransformEvent) {
 
   MouseEvent p2(ui::ET_MOUSE_PRESSED,
                 110, 320,
-                ui::EF_LEFT_BUTTON_DOWN);
+                ui::EF_LEFT_MOUSE_BUTTON);
   root->OnMousePressed(p2);
   EXPECT_EQ(0, v1->last_mouse_event_type_);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
@@ -1804,7 +1804,7 @@ TEST_F(ViewTest, TransformEvent) {
 
   MouseEvent p3(ui::ET_MOUSE_PRESSED,
                 112, 110,
-                ui::EF_LEFT_BUTTON_DOWN);
+                ui::EF_LEFT_MOUSE_BUTTON);
   root->OnMousePressed(p3);
 
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_);
@@ -1840,7 +1840,7 @@ TEST_F(ViewTest, TransformEvent) {
 
   MouseEvent p4(ui::ET_MOUSE_PRESSED,
                 124, 125,
-                ui::EF_LEFT_BUTTON_DOWN);
+                ui::EF_LEFT_MOUSE_BUTTON);
   root->OnMousePressed(p4);
 
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_);
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 040a653..a765617 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -194,14 +194,14 @@ TEST_F(WidgetTest, DISABLED_GrabUngrab) {
   RunPendingMessages();
 
   // Click on child1
-  MouseEvent pressed(ui::ET_MOUSE_PRESSED, 45, 45, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent pressed(ui::ET_MOUSE_PRESSED, 45, 45, ui::EF_LEFT_MOUSE_BUTTON);
   toplevel->OnMouseEvent(pressed);
 
   EXPECT_TRUE(WidgetHasMouseCapture(toplevel));
   EXPECT_TRUE(WidgetHasMouseCapture(child1));
   EXPECT_FALSE(WidgetHasMouseCapture(child2));
 
-  MouseEvent released(ui::ET_MOUSE_RELEASED, 45, 45, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent released(ui::ET_MOUSE_RELEASED, 45, 45, ui::EF_LEFT_MOUSE_BUTTON);
   toplevel->OnMouseEvent(released);
 
   EXPECT_FALSE(WidgetHasMouseCapture(toplevel));
@@ -211,13 +211,14 @@ TEST_F(WidgetTest, DISABLED_GrabUngrab) {
   RunPendingMessages();
 
   // Click on child2
-  MouseEvent pressed2(ui::ET_MOUSE_PRESSED, 315, 45, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent pressed2(ui::ET_MOUSE_PRESSED, 315, 45, ui::EF_LEFT_MOUSE_BUTTON);
   EXPECT_TRUE(toplevel->OnMouseEvent(pressed2));
   EXPECT_TRUE(WidgetHasMouseCapture(toplevel));
   EXPECT_TRUE(WidgetHasMouseCapture(child2));
   EXPECT_FALSE(WidgetHasMouseCapture(child1));
 
-  MouseEvent released2(ui::ET_MOUSE_RELEASED, 315, 45, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent released2(ui::ET_MOUSE_RELEASED, 315, 45,
+                       ui::EF_LEFT_MOUSE_BUTTON);
   toplevel->OnMouseEvent(released2);
   EXPECT_FALSE(WidgetHasMouseCapture(toplevel));
   EXPECT_FALSE(WidgetHasMouseCapture(child1));