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

chrome/browser/ui/views/frame/browser_root_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/frame/browser_root_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 38 matching lines @@
     return false;
 
   // If there is a URL, we'll allow the drop.
   if (data.HasURL())
     return true;
 
   // If there isn't a URL, see if we can 'paste and go'.
   return GetPasteAndGoURL(data, NULL);
 }
 
-void BrowserRootView::OnDragEntered(const views::DropTargetEvent& event) {
+void BrowserRootView::OnDragEntered(const ui::DropTargetEvent& event) {
   if (ShouldForwardToTabStrip(event)) {
     forwarding_to_tab_strip_ = true;
-    scoped_ptr<views::DropTargetEvent> mapped_event(
+    scoped_ptr<ui::DropTargetEvent> mapped_event(
         MapEventToTabStrip(event, event.data()));
     tabstrip()->OnDragEntered(*mapped_event.get());
   }
 }
 
-int BrowserRootView::OnDragUpdated(const views::DropTargetEvent& event) {
+int BrowserRootView::OnDragUpdated(const ui::DropTargetEvent& event) {
   if (ShouldForwardToTabStrip(event)) {
-    scoped_ptr<views::DropTargetEvent> mapped_event(
+    scoped_ptr<ui::DropTargetEvent> mapped_event(
         MapEventToTabStrip(event, event.data()));
     if (!forwarding_to_tab_strip_) {
       tabstrip()->OnDragEntered(*mapped_event.get());
       forwarding_to_tab_strip_ = true;
     }
     return tabstrip()->OnDragUpdated(*mapped_event.get());
   } else if (forwarding_to_tab_strip_) {
     forwarding_to_tab_strip_ = false;
     tabstrip()->OnDragExited();
   }
   return ui::DragDropTypes::DRAG_NONE;
 }
 
 void BrowserRootView::OnDragExited() {
   if (forwarding_to_tab_strip_) {
     forwarding_to_tab_strip_ = false;
     tabstrip()->OnDragExited();
   }
 }
 
-int BrowserRootView::OnPerformDrop(const views::DropTargetEvent& event) {
+int BrowserRootView::OnPerformDrop(const ui::DropTargetEvent& event) {
   if (!forwarding_to_tab_strip_)
     return ui::DragDropTypes::DRAG_NONE;
 
   // Extract the URL and create a new ui::OSExchangeData containing the URL. We
   // do this as the TabStrip doesn't know about the autocomplete edit and needs
   // to know about it to handle 'paste and go'.
   GURL url;
   string16 title;
   ui::OSExchangeData mapped_data;
   if (!event.data().GetURLAndTitle(&url, &title) || !url.is_valid()) {
     // The url isn't valid. Use the paste and go url.
     if (GetPasteAndGoURL(event.data(), &url))
       mapped_data.SetURL(url, string16());
     // else case: couldn't extract a url or 'paste and go' url. This ends up
     // passing through an ui::OSExchangeData with nothing in it. We need to do
     // this so that the tab strip cleans up properly.
   } else {
     mapped_data.SetURL(url, string16());
   }
   forwarding_to_tab_strip_ = false;
-  scoped_ptr<views::DropTargetEvent> mapped_event(
+  scoped_ptr<ui::DropTargetEvent> mapped_event(
       MapEventToTabStrip(event, mapped_data));
   return tabstrip()->OnPerformDrop(*mapped_event);
 }
 
 void BrowserRootView::GetAccessibleState(ui::AccessibleViewState* state) {
   views::internal::RootView::GetAccessibleState(state);
   state->name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
 }
 
 std::string BrowserRootView::GetClassName() const {
   return kViewClassName;
 }
 
 bool BrowserRootView::ShouldForwardToTabStrip(
-    const views::DropTargetEvent& event) {
+    const ui::DropTargetEvent& event) {
   if (!tabstrip()->visible())
     return false;
 
   // Allow the drop as long as the mouse is over the tabstrip or vertically
   // before it.
   gfx::Point tab_loc_in_host;
   ConvertPointToTarget(tabstrip(), this, &tab_loc_in_host);
   return event.y() < tab_loc_in_host.y() + tabstrip()->height();
 }
 
-views::DropTargetEvent* BrowserRootView::MapEventToTabStrip(
-    const views::DropTargetEvent& event,
+ui::DropTargetEvent* BrowserRootView::MapEventToTabStrip(
+    const ui::DropTargetEvent& event,
     const ui::OSExchangeData& data) {
   gfx::Point tab_strip_loc(event.location());
   ConvertPointToTarget(this, tabstrip(), &tab_strip_loc);
-  return new views::DropTargetEvent(data, tab_strip_loc.x(),
-                                    tab_strip_loc.y(),
-                                    event.source_operations());
+  return new ui::DropTargetEvent(data, tab_strip_loc, tab_strip_loc,
+                                 event.source_operations());
 }
 
 TabStrip* BrowserRootView::tabstrip() const {
   return browser_view_->tabstrip();
 }
 
 bool BrowserRootView::GetPasteAndGoURL(const ui::OSExchangeData& data,
                                        GURL* url) {
   if (!data.HasString())
     return false;
 
   string16 text;
   if (!data.GetString(&text) || text.empty())
     return false;
   text = AutocompleteMatch::SanitizeString(text);
 
   AutocompleteMatch match;
   AutocompleteClassifierFactory::GetForProfile(
       browser_view_->browser()->profile())->Classify(text, string16(), false,
                                                      false, &match, NULL);
   if (!match.destination_url.is_valid())
     return false;
 
   if (url)
     *url = match.destination_url;
   return true;
 }