Convert Aura to use ui::Event.

ash/touch/touch_observer_hud.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/touch/touch_observer_hud.h"
 
 #include "ash/shell_window_ids.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkXfermode.h"
-#include "ui/aura/event.h"
+#include "ui/base/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 153 matching lines @@
     default:
       status = "?";
       break;
   }
   std::string string = base::StringPrintf("%2d: %s %s",
       index, status, touch_positions_[index].ToString().c_str());
   touch_labels_[index]->SetText(UTF8ToUTF16(string));
 }
 
 bool TouchObserverHUD::PreHandleKeyEvent(aura::Window* target,
-                                         aura::KeyEvent* event) {
+                                         ui::KeyEvent* event) {
   return false;
 }
 
 bool TouchObserverHUD::PreHandleMouseEvent(aura::Window* target,
-                                           aura::MouseEvent* event) {
+                                           ui::MouseEvent* event) {
   return false;
 }
 
 ui::TouchStatus TouchObserverHUD::PreHandleTouchEvent(
     aura::Window* target,
-    aura::TouchEvent* event) {
+    ui::TouchEventImpl* event) {
   if (event->touch_id() >= kMaxTouchPoints)
     return ui::TOUCH_STATUS_UNKNOWN;
 
   if (event->type() != ui::ET_TOUCH_CANCELLED)
     touch_positions_[event->touch_id()] = event->root_location();
   if (event->type() == ui::ET_TOUCH_PRESSED)
     canvas_->Start(event->touch_id(), touch_positions_[event->touch_id()]);
   else
     canvas_->Update(event->touch_id(), touch_positions_[event->touch_id()]);
   touch_status_[event->touch_id()] = event->type();
   touch_labels_[event->touch_id()]->SetVisible(true);
   UpdateTouchPointLabel(event->touch_id());
 
   widget_->SetSize(widget_->GetContentsView()->GetPreferredSize());
 
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::GestureStatus TouchObserverHUD::PreHandleGestureEvent(
     aura::Window* target,
-    aura::GestureEvent* event) {
+    ui::GestureEventImpl* event) {
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 void TouchObserverHUD::OnWidgetClosing(views::Widget* widget) {
   DCHECK_EQ(widget, widget_);
   widget_ = NULL;
 }
 
 }  // namespace internal
 }  // namespace ash