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

chrome/browser/ui/views/toolbar_view.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/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
@@ skipping 792 matching lines @@
   *formats = ui::OSExchangeData::URL | ui::OSExchangeData::STRING;
   return true;
 }
 
 bool ToolbarView::CanDrop(const ui::OSExchangeData& data) {
   // To support loading URLs by dropping into the toolbar, we need to support
   // dropping URLs and/or text.
   return data.HasURL() || data.HasString();
 }
 
-int ToolbarView::OnDragUpdated(const views::DropTargetEvent& event) {
+int ToolbarView::OnDragUpdated(const ui::DropTargetEvent& event) {
   if (event.source_operations() & ui::DragDropTypes::DRAG_COPY) {
     return ui::DragDropTypes::DRAG_COPY;
   } else if (event.source_operations() & ui::DragDropTypes::DRAG_LINK) {
     return ui::DragDropTypes::DRAG_LINK;
   }
   return ui::DragDropTypes::DRAG_NONE;
 }
 
-int ToolbarView::OnPerformDrop(const views::DropTargetEvent& event) {
+int ToolbarView::OnPerformDrop(const ui::DropTargetEvent& event) {
   return location_bar_->GetLocationEntry()->OnPerformDrop(event);
 }
 
 void ToolbarView::OnThemeChanged() {
   LoadImages();
 }
 
 std::string ToolbarView::GetClassName() const {
   return kViewClassName;
 }
@@ skipping 179 matching lines @@
   // LocationBarContainer is not a child of the ToolbarView.
   gfx::Point origin(bounds.origin());
   views::View::ConvertPointToTarget(this, location_bar_container_->parent(),
                                   &origin);
   gfx::Rect target_bounds(origin, bounds.size());
   if (location_bar_container_->GetTargetBounds() != target_bounds) {
     location_bar_container_->SetInToolbar(true);
     location_bar_container_->SetBoundsRect(target_bounds);
   }
 }