Replace views::Event with ui::Event.

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"
@@ skipping 36 matching lines @@
       BuildRootLayers(view->child_at(i), layers);
   }
 }
 
 }  // 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)
+  ScopedEvent(Widget* widget, const ui::Event& event)
       : widget_(widget),
-        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) {
+        event_(&event) {
     widget->event_stack_.push(this);
   }
 
   ~ScopedEvent() {
     if (widget_)
       widget_->event_stack_.pop();
   }
 
   void reset() {
     widget_ = NULL;
   }
 
-  const Event* event() {
+  const ui::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_;
+  const ui::Event* 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 774 matching lines @@
 
 void Widget::ReleaseCapture() {
   if (native_widget_->HasCapture())
     native_widget_->ReleaseCapture();
 }
 
 bool Widget::HasCapture() {
   return native_widget_->HasCapture();
 }
 
-const Event* Widget::GetCurrentEvent() {
+const ui::Event* Widget::GetCurrentEvent() {
   return event_stack_.empty() ? NULL : event_stack_.top()->event();
 }
 
 void Widget::TooltipTextChanged(View* view) {
   TooltipManager* manager = native_widget_private()->GetTooltipManager();
   if (manager)
     manager->TooltipTextChanged(view);
 }
 
 bool Widget::SetInitialFocus() {
@@ skipping 444 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views