Replace views::MouseEvent with ui::MouseEvent

ui/views/controls/menu/menu_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/run_loop.h"
 #include "base/time.h"
@@ skipping 418 matching lines @@
     showing_ = false;
     delegate_->DropMenuClosed(
         internal::MenuControllerDelegate::NOTIFY_DELEGATE,
         selected->GetRootMenuItem());
     // WARNING: the call to MenuClosed deletes us.
     return;
   }
 }
 
 void MenuController::OnMousePressed(SubmenuView* source,
-                                    const MouseEvent& event) {
+                                    const ui::MouseEvent& event) {
   SetSelectionOnPointerDown(source, event);
 }
 
 void MenuController::OnMouseDragged(SubmenuView* source,
-                                    const MouseEvent& event) {
+                                    const ui::MouseEvent& event) {
   MenuPart part = GetMenuPart(source, event.location());
   UpdateScrolling(part);
 
   if (!blocking_run_)
     return;
 
   if (possible_drag_) {
     if (View::ExceededDragThreshold(event.x() - press_pt_.x(),
                                     event.y() - press_pt_.y())) {
       StartDrag(source, press_pt_);
     }
     return;
   }
   MenuItemView* mouse_menu = NULL;
   if (part.type == MenuPart::MENU_ITEM) {
     if (!part.menu)
       part.menu = source->GetMenuItem();
     else
       mouse_menu = part.menu;
     SetSelection(part.menu ? part.menu : state_.item, SELECTION_OPEN_SUBMENU);
   } else if (part.type == MenuPart::NONE) {
     ShowSiblingMenu(source, event.location());
   }
   UpdateActiveMouseView(source, event, mouse_menu);
 }
 
 void MenuController::OnMouseReleased(SubmenuView* source,
-                                     const MouseEvent& event) {
+                                     const ui::MouseEvent& event) {
   if (!blocking_run_)
     return;
 
   // We must ignore the first release event when it occured within the original
   // bounds.
   if (drop_first_release_event_ && (event.flags() & ui::EF_LEFT_MOUSE_BUTTON)) {
     drop_first_release_event_ = false;
     gfx::Point loc(event.location());
     View::ConvertPointToScreen(source->GetScrollViewContainer(), &loc);
     DCHECK(!state_.initial_bounds.IsEmpty());
@@ skipping 28 matching lines @@
     }
   } else if (part.type == MenuPart::MENU_ITEM) {
     // User either clicked on empty space, or a menu that has children.
     SetSelection(part.menu ? part.menu : state_.item,
                  SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
   }
   SendMouseCaptureLostToActiveView();
 }
 
 void MenuController::OnMouseMoved(SubmenuView* source,
-                                  const MouseEvent& event) {
+                                  const ui::MouseEvent& event) {
   HandleMouseLocation(source, event.location());
 }
 
 void MenuController::OnMouseEntered(SubmenuView* source,
-                                    const MouseEvent& event) {
+                                    const ui::MouseEvent& event) {
   // MouseEntered is always followed by a mouse moved, so don't need to
   // do anything here.
 }
 
 #if defined(OS_LINUX)
 bool MenuController::OnMouseWheel(SubmenuView* source,
                                   const MouseWheelEvent& event) {
   MenuPart part = GetMenuPart(source, event.location());
   return part.submenu && part.submenu->OnMouseWheel(event);
 }
@@ skipping 1467 matching lines @@
   if (!scroll_task_.get())
     scroll_task_.reset(new MenuScrollTask());
   scroll_task_->Update(part);
 }
 
 void MenuController::StopScrolling() {
   scroll_task_.reset(NULL);
 }
 
 void MenuController::UpdateActiveMouseView(SubmenuView* event_source,
-                                           const MouseEvent& event,
+                                           const ui::MouseEvent& event,
                                            View* target_menu) {
   View* target = NULL;
   gfx::Point target_menu_loc(event.location());
   if (target_menu && target_menu->has_children()) {
     // Locate the deepest child view to send events to.  This code assumes we
     // don't have to walk up the tree to find a view interested in events. This
     // is currently true for the cases we are embedding views, but if we embed
     // more complex hierarchies it'll need to change.
     View::ConvertPointToScreen(event_source->GetScrollViewContainer(),
                                &target_menu_loc);
     View::ConvertPointToTarget(NULL, target_menu, &target_menu_loc);
     target = target_menu->GetEventHandlerForPoint(target_menu_loc);
     if (target == target_menu || !target->enabled())
       target = NULL;
   }
   if (target != active_mouse_view_) {
     SendMouseCaptureLostToActiveView();
     active_mouse_view_ = target;
     if (active_mouse_view_) {
       gfx::Point target_point(target_menu_loc);
       View::ConvertPointToTarget(
           target_menu, active_mouse_view_, &target_point);
-      MouseEvent mouse_entered_event(ui::ET_MOUSE_ENTERED,
-                                     target_point.x(), target_point.y(), 0);
+      ui::MouseEvent mouse_entered_event(ui::ET_MOUSE_ENTERED,
+                                         target_point, target_point,
+                                         0);
       active_mouse_view_->OnMouseEntered(mouse_entered_event);
 
-      MouseEvent mouse_pressed_event(ui::ET_MOUSE_PRESSED,
-                                     target_point.x(), target_point.y(),
-                                     event.flags());
+      ui::MouseEvent mouse_pressed_event(ui::ET_MOUSE_PRESSED,
+                                         target_point, target_point,
+                                         event.flags());
       active_mouse_view_->OnMousePressed(mouse_pressed_event);
     }
   }
 
   if (active_mouse_view_) {
     gfx::Point target_point(target_menu_loc);
     View::ConvertPointToTarget(target_menu, active_mouse_view_, &target_point);
-    MouseEvent mouse_dragged_event(ui::ET_MOUSE_DRAGGED,
-                                   target_point.x(), target_point.y(),
-                                   event.flags());
+    ui::MouseEvent mouse_dragged_event(ui::ET_MOUSE_DRAGGED,
+                                       target_point, target_point,
+                                       event.flags());
     active_mouse_view_->OnMouseDragged(mouse_dragged_event);
   }
 }
 
 void MenuController::SendMouseReleaseToActiveView(SubmenuView* event_source,
-                                                  const MouseEvent& event) {
+                                                  const ui::MouseEvent& event) {
   if (!active_mouse_view_)
     return;
 
   gfx::Point target_loc(event.location());
   View::ConvertPointToScreen(event_source->GetScrollViewContainer(),
                              &target_loc);
   View::ConvertPointToTarget(NULL, active_mouse_view_, &target_loc);
-  MouseEvent release_event(ui::ET_MOUSE_RELEASED, target_loc.x(),
-                           target_loc.y(), event.flags());
+  ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED,
+                           target_loc, target_loc,
+                           event.flags());
   // Reset the active_mouse_view_ before sending mouse released. That way if it
   // calls back to us, we aren't in a weird state.
   View* active_view = active_mouse_view_;
   active_mouse_view_ = NULL;
   active_view->OnMouseReleased(release_event);
 }
 
 void MenuController::SendMouseCaptureLostToActiveView() {
   if (!active_mouse_view_)
     return;
@@ skipping 62 matching lines @@
 
 #if defined(USE_AURA)
 void MenuController::OnWindowActivated(aura::Window* active,
                                        aura::Window* old_active) {
   if (!drag_in_progress_)
     Cancel(EXIT_ALL);
 }
 #endif
 
 }  // namespace views