Remove views::KeyEvent, replacing uses of it with ui::KeyEvent.

ui/views/widget/widget.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/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/event.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_font_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/focus/widget_focus_manager.h"
@@ skipping 28 matching lines @@
 }
 
 }  // namespace
 
 // This class is used to keep track of the event a Widget is processing, and
 // restore any previously active event afterwards.
 class ScopedEvent {
  public:
   ScopedEvent(Widget* widget, const Event& event)
       : widget_(widget),
-        event_(&event) {
+        event_(&event),
+        ui_event_(NULL) {
+    widget->event_stack_.push(this);
+  }
+  ScopedEvent(Widget* widget, const ui::Event& ui_event)
+      : widget_(widget),
+        event_(NULL),
+        ui_event_(&ui_event) {
     widget->event_stack_.push(this);
   }
 
   ~ScopedEvent() {
     if (widget_)
       widget_->event_stack_.pop();
   }
 
   void reset() {
     widget_ = NULL;
   }
 
   const Event* event() {
     return event_;
   }
+  const ui::Event* ui_event() {
+    return ui_event_;
+  }
 
  private:
   Widget* widget_;
   const Event* event_;
+  // TODO(beng): remove once views::Event is gone.
+  const ui::Event* ui_event_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedEvent);
 };
 
 // A default implementation of WidgetDelegate, used by Widget when no
 // WidgetDelegate is supplied.
 class DefaultWidgetDelegate : public WidgetDelegate {
  public:
   DefaultWidgetDelegate(Widget* widget, const Widget::InitParams& params)
       : widget_(widget),
@@ skipping 962 matching lines @@
 void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   GetRootView()->Paint(canvas);
 }
 
 int Widget::GetNonClientComponent(const gfx::Point& point) {
   return non_client_view_ ?
       non_client_view_->NonClientHitTest(point) :
       HTNOWHERE;
 }
 
-bool Widget::OnKeyEvent(const KeyEvent& event) {
+bool Widget::OnKeyEvent(const ui::KeyEvent& event) {
   ScopedEvent scoped(this, event);
   return static_cast<internal::RootView*>(GetRootView())->OnKeyEvent(event);
 }
 
 bool Widget::OnMouseEvent(const MouseEvent& event) {
   ScopedEvent scoped(this, event);
   switch (event.type()) {
     case ui::ET_MOUSE_PRESSED:
       last_mouse_event_was_move_ = false;
       // Make sure we're still visible before we attempt capture as the mouse
@@ skipping 256 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views