Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE…

chrome/browser/ui/views/omnibox/omnibox_view_win.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_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 209 matching lines @@
   ResetDropHighlights();
 }
 
 DWORD OmniboxViewWin::EditDropTarget::OnDrop(IDataObject* data_object,
                                              DWORD key_state,
                                              POINT cursor_position,
                                              DWORD effect) {
   effect = OnDragOver(data_object, key_state, cursor_position, effect);
 
   ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object));
-  views::DropTargetEvent event(os_data, cursor_position.x, cursor_position.y,
+  ui::DropTargetEvent event(os_data, cursor_position.x, cursor_position.y,
       ui::DragDropTypes::DropEffectToDragOperation(effect));
 
   int drag_operation = edit_->OnPerformDropImpl(event, edit_->in_drag());
 
   if (!drag_has_url_)
     ResetDropHighlights();
 
   return ui::DragDropTypes::DragOperationToDropEffect(drag_operation);
 }
 
@@ skipping 708 matching lines @@
 }
 
 views::View* OmniboxViewWin::AddToView(views::View* parent) {
   native_view_host_ = new OmniboxViewWrapper(this);
   parent->AddChildView(native_view_host_);
   native_view_host_->set_focus_view(parent);
   native_view_host_->Attach(GetNativeView());
   return native_view_host_;
 }
 
-int OmniboxViewWin::OnPerformDrop(const views::DropTargetEvent& event) {
+int OmniboxViewWin::OnPerformDrop(const ui::DropTargetEvent& event) {
   return OnPerformDropImpl(event, false);
 }
 
 gfx::Font OmniboxViewWin::GetFont() {
   return font_;
 }
 
 int OmniboxViewWin::WidthOfTextAfterCursor() {
   CHARRANGE selection;
   GetSelection(selection);
   // See comments in LocationBarView::Layout as to why this uses -1.
   const int start = std::max(0, static_cast<int>(selection.cpMax - 1));
   return WidthNeededToDisplay(GetText().substr(start));
 }
 
-int OmniboxViewWin::OnPerformDropImpl(const views::DropTargetEvent& event,
+int OmniboxViewWin::OnPerformDropImpl(const ui::DropTargetEvent& event,
                                       bool in_drag) {
   const ui::OSExchangeData& data = event.data();
 
   if (data.HasURL()) {
     GURL url;
     string16 title;
     if (data.GetURLAndTitle(&url, &title)) {
       string16 text(StripJavascriptSchemas(UTF8ToUTF16(url.spec())));
       OmniboxView::SetUserText(text);
       model()->AcceptInput(CURRENT_TAB, true);
@@ skipping 1646 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }