Convert Aura to use ui::Event.

ash/tooltips/tooltip_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 "ash/tooltips/tooltip_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/cursor_manager.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/string_split.h"
 #include "base/time.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/env.h"
-#include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
+#include "ui/base/event.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
@@ skipping 200 matching lines @@
 }
 
 void TooltipController::SetTooltipsEnabled(bool enable) {
   if (tooltips_enabled_ == enable)
     return;
   tooltips_enabled_ = enable;
   UpdateTooltip(tooltip_window_);
 }
 
 bool TooltipController::PreHandleKeyEvent(aura::Window* target,
-                                          aura::KeyEvent* event) {
+                                          ui::KeyEvent* event) {
   // On key press, we want to hide the tooltip and not show it until change.
   // This is the same behavior as hiding tooltips on timeout. Hence, we can
   // simply simulate a timeout.
   if (tooltip_shown_timer_.IsRunning()) {
     tooltip_shown_timer_.Stop();
     TooltipShownTimerFired();
   }
   return false;
 }
 
 bool TooltipController::PreHandleMouseEvent(aura::Window* target,
-                                            aura::MouseEvent* event) {
+                                            ui::MouseEvent* event) {
   switch (event->type()) {
     case ui::ET_MOUSE_MOVED:
     case ui::ET_MOUSE_DRAGGED:
       if (tooltip_window_ != target) {
         if (tooltip_window_)
           tooltip_window_->RemoveObserver(this);
         tooltip_window_ = target;
         tooltip_window_->AddObserver(this);
       }
       curr_mouse_loc_ = event->location();
@@ skipping 24 matching lines @@
         GetTooltip()->Hide();
       break;
     default:
       break;
   }
   return false;
 }
 
 ui::TouchStatus TooltipController::PreHandleTouchEvent(
     aura::Window* target,
-    aura::TouchEvent* event) {
+    ui::TouchEventImpl* event) {
   // TODO(varunjain): need to properly implement tooltips for
   // touch events.
   // Hide the tooltip for touch events.
   if (GetTooltip()->IsVisible())
     GetTooltip()->Hide();
   if (tooltip_window_)
     tooltip_window_->RemoveObserver(this);
   tooltip_window_ = NULL;
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::GestureStatus TooltipController::PreHandleGestureEvent(
     aura::Window* target,
-    aura::GestureEvent* event) {
+    ui::GestureEventImpl* event) {
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 void TooltipController::OnWindowDestroyed(aura::Window* window) {
   if (tooltip_window_ == window) {
     tooltip_window_->RemoveObserver(this);
     tooltip_window_ = NULL;
   }
 }
 
@@ skipping 149 matching lines @@
 }
 
 TooltipController::Tooltip* TooltipController::GetTooltip() {
   if (!tooltip_.get())
     tooltip_.reset(new Tooltip);
   return tooltip_.get();
 }
 
 }  // namespace internal
 }  // namespace ash