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

ui/views/controls/combobox/native_combobox_views.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/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/event.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/focusable_border.h"
@@ skipping 67 matching lines @@
 ui::GestureStatus NativeComboboxViews::OnGestureEvent(
     const views::GestureEvent& gesture_event) {
   if (gesture_event.type() == ui::ET_GESTURE_TAP) {
     UpdateFromModel();
     ShowDropDownMenu();
     return ui::GESTURE_STATUS_CONSUMED;
   }
   return View::OnGestureEvent(gesture_event);
 }
 
-bool NativeComboboxViews::OnKeyPressed(const views::KeyEvent& key_event) {
+bool NativeComboboxViews::OnKeyPressed(const ui::KeyEvent& key_event) {
   // TODO(oshima): handle IME.
   DCHECK_EQ(key_event.type(), ui::ET_KEY_PRESSED);
 
   // Check if we are in the default state (-1) and set to first item.
   if (selected_index_ == -1)
     selected_index_ = 0;
 
   int new_index = selected_index_;
   switch (key_event.key_code()) {
     // Move to the next item if any.
@@ skipping 26 matching lines @@
 
   if (new_index != selected_index_) {
     selected_index_ = new_index;
     combobox_->SelectionChanged();
     SchedulePaint();
   }
 
   return true;
 }
 
-bool NativeComboboxViews::OnKeyReleased(const views::KeyEvent& key_event) {
+bool NativeComboboxViews::OnKeyReleased(const ui::KeyEvent& key_event) {
   return true;
 }
 
 void NativeComboboxViews::OnPaint(gfx::Canvas* canvas) {
   text_border_->set_has_focus(combobox_->HasFocus());
   OnPaintBackground(canvas);
   PaintText(canvas);
   OnPaintBorder(canvas);
 }
 
@@ skipping 63 matching lines @@
 }
 
 View* NativeComboboxViews::GetView() {
   return this;
 }
 
 void NativeComboboxViews::SetFocus() {
   text_border_->set_has_focus(true);
 }
 
-bool NativeComboboxViews::HandleKeyPressed(const KeyEvent& e) {
+bool NativeComboboxViews::HandleKeyPressed(const ui::KeyEvent& e) {
   return OnKeyPressed(e);
 }
 
-bool NativeComboboxViews::HandleKeyReleased(const KeyEvent& e) {
+bool NativeComboboxViews::HandleKeyReleased(const ui::KeyEvent& e) {
   return false;  // crbug.com/127520
 }
 
 void NativeComboboxViews::HandleFocus() {
   SchedulePaint();
 }
 
 void NativeComboboxViews::HandleBlur() {
 }
 
@@ skipping 113 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxViews(combobox);
 }
 #endif
 
 }  // namespace views