Replace views::LocatedEvent with ui::LocatedEvent

chrome/browser/ui/views/omnibox/inline_omnibox_popup_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/omnibox/inline_omnibox_popup_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
@@ skipping 80 matching lines @@
       size_animation_.GetCurrentValue() * total_height_delta - 0.5);
   current_frame_bounds.set_height(
       current_frame_bounds.height() + current_height_delta);
   return current_frame_bounds;
 }
 
 void InlineOmniboxPopupView::LayoutChildren() {
   // Make the children line up with the LocationBar.
   gfx::Point content_origin;
   // TODO(sky): this won't work correctly with LocationBarContainer.
-  views::View::ConvertPointToView(location_bar_, this, &content_origin);
+  views::View::ConvertPointToTarget(location_bar_, this, &content_origin);
   int x = content_origin.x();
   int width = location_bar_->width();
   gfx::Rect contents_rect = GetContentsBounds();
   int top = contents_rect.y();
   for (int i = 0; i < child_count(); ++i) {
     View* v = child_at(i);
     if (v->visible()) {
       v->SetBounds(x, top, width, v->GetPreferredSize().height());
       top = v->bounds().bottom();
     }
@@ skipping 248 matching lines @@
 
 size_t InlineOmniboxPopupView::GetIndexForPoint(const gfx::Point& point) {
   if (!HitTestPoint(point))
     return OmniboxPopupModel::kNoMatch;
 
   int nb_match = model_->result().size();
   DCHECK(nb_match <= child_count());
   for (int i = 0; i < nb_match; ++i) {
     views::View* child = child_at(i);
     gfx::Point point_in_child_coords(point);
-    View::ConvertPointToView(this, child, &point_in_child_coords);
+    View::ConvertPointToTarget(this, child, &point_in_child_coords);
     if (child->HitTestPoint(point_in_child_coords))
       return i;
   }
   return OmniboxPopupModel::kNoMatch;
 }
 
 gfx::Rect InlineOmniboxPopupView::CalculateTargetBounds(int h) {
   return gfx::Rect(0, 0, 1, h);
 }
 
 void InlineOmniboxPopupView::UpdateLineEvent(
-    const views::LocatedEvent& event,
+    const ui::LocatedEvent& event,
     bool should_set_selected_line) {
   size_t index = GetIndexForPoint(event.location());
   model_->SetHoveredLine(index);
   if (HasMatchAt(index) && should_set_selected_line)
     model_->SetSelectedLine(index, false, false);
 }
 
 void InlineOmniboxPopupView::OpenSelectedLine(
-    const views::LocatedEvent& event,
+    const ui::LocatedEvent& event,
     WindowOpenDisposition disposition) {
   size_t index = GetIndexForPoint(event.location());
   OpenIndex(index, disposition);
 }