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

chrome/browser/ui/views/omnibox/omnibox_view_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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/logging.h"
 #include "base/property_bag.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 17 matching lines @@
 #include "googleurl/src/gurl.h"
 #include "grit/app_locale_settings.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_strings.h"
 #include "net/base/escape.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/event.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/textfield/textfield.h"
@@ skipping 33 matching lines @@
   virtual void OnFocus() OVERRIDE {
     views::Textfield::OnFocus();
     omnibox_view_->HandleFocusIn();
   }
 
   virtual void OnBlur() OVERRIDE {
     views::Textfield::OnBlur();
     omnibox_view_->HandleFocusOut();
   }
 
-  virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE {
+  virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE {
     bool handled = views::Textfield::OnKeyPressed(event);
     return omnibox_view_->HandleAfterKeyEvent(event, handled) || handled;
   }
 
-  virtual bool OnKeyReleased(const views::KeyEvent& event) OVERRIDE {
+  virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE {
     return omnibox_view_->HandleKeyReleaseEvent(event);
   }
 
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
     // Pass through the views::Textfield's return value; we don't need to
     // override its behavior.
     bool result = views::Textfield::OnMousePressed(event);
     omnibox_view_->HandleMousePressEvent(event);
     return result;
   }
@@ skipping 191 matching lines @@
 
 int OmniboxViewViews::WidthOfTextAfterCursor() {
   ui::Range sel;
   textfield_->GetSelectedRange(&sel);
   // See comments in LocationBarView::Layout as to why this uses -1.
   const int start = std::max(0, static_cast<int>(sel.end()) - 1);
   // TODO: add horizontal margin.
   return textfield_->font().GetStringWidth(GetText().substr(start));
 }
 
-bool OmniboxViewViews::HandleAfterKeyEvent(const views::KeyEvent& event,
+bool OmniboxViewViews::HandleAfterKeyEvent(const ui::KeyEvent& event,
                                            bool handled) {
   if (event.key_code() == ui::VKEY_RETURN) {
     bool alt_held = event.IsAltDown();
     model()->AcceptInput(alt_held ? NEW_FOREGROUND_TAB : CURRENT_TAB, false);
     handled = true;
   } else if (!handled && event.key_code() == ui::VKEY_ESCAPE) {
     // We can handle the Escape key if textfield did not handle it.
     // If it's not handled by us, then we need to propagate it up to the parent
     // widgets, so that Escape accelerator can still work.
     handled = model()->OnEscapeKeyPressed();
@@ skipping 42 matching lines @@
       }
 
       // TODO(Oshima): handle instant
     }
   }
   // TODO(oshima): page up & down
 
   return handled;
 }
 
-bool OmniboxViewViews::HandleKeyReleaseEvent(const views::KeyEvent& event) {
+bool OmniboxViewViews::HandleKeyReleaseEvent(const ui::KeyEvent& event) {
   // Omnibox2 can switch its contents while pressing a control key. To switch
   // the contents of omnibox2, we notify the OmniboxEditModel class when the
   // control-key state is changed.
   if (event.key_code() == ui::VKEY_CONTROL) {
     // TODO(oshima): investigate if we need to support keyboard with two
     // controls.
     model()->OnControlKeyChanged(false);
     return true;
   }
   return false;
@@ skipping 334 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxViewViews, views::TextfieldController implementation:
 
 void OmniboxViewViews::ContentsChanged(views::Textfield* sender,
                                        const string16& new_contents) {
 }
 
 bool OmniboxViewViews::HandleKeyEvent(views::Textfield* textfield,
-                                      const views::KeyEvent& event) {
+                                      const ui::KeyEvent& event) {
   delete_at_end_pressed_ = false;
 
   if (event.key_code() == ui::VKEY_BACK) {
     // Checks if it's currently in keyword search mode.
     if (model()->is_keyword_hint() || model()->keyword().empty())
       return false;
     // If there is selection, let textfield handle the backspace.
     if (textfield_->HasSelection())
       return false;
     // If not at the begining of the text, let textfield handle the backspace.
@@ skipping 161 matching lines @@
                                                const ui::Range& range) {
   if (text != GetText())
     textfield_->SetText(text);
   textfield_->SelectRange(range);
 }
 
 string16 OmniboxViewViews::GetSelectedText() const {
   // TODO(oshima): Support instant, IME.
   return textfield_->GetSelectedText();
 }