Replace views::LocatedEvent with ui::LocatedEvent

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 713 matching lines @@
     // ntp pages.
     chrome::UpdateCommandEnabled(browser_, IDC_RELOAD, false);
     // Disable zooming for NTP mode.
     chrome::UpdateCommandEnabled(browser_, IDC_ZOOM_MINUS, false);
     chrome::UpdateCommandEnabled(browser_, IDC_ZOOM_PLUS, false);
   } else {
     // Start the location bar animation.
     if (si_mode.animate && si_mode.is_search() &&
         !location_bar_container_->IsAnimating()) {
       gfx::Point location_bar_origin(location_bar_bounds.origin());
-      views::View::ConvertPointToView(this, location_bar_container_->parent(),
+      views::View::ConvertPointToTarget(this, location_bar_container_->parent(),
                                       &location_bar_origin);
       location_bar_container_->AnimateTo(
           gfx::Rect(location_bar_origin, location_bar_bounds.size()));
     } else {
       SetLocationBarContainerBounds(location_bar_bounds);
     }
     // Enable reload and zooming for non-NTP modes.
     chrome::UpdateCommandEnabled(browser_, IDC_RELOAD, true);
     chrome::UpdateCommandEnabled(browser_, IDC_ZOOM_MINUS, true);
     chrome::UpdateCommandEnabled(browser_, IDC_ZOOM_PLUS, true);
@@ skipping 259 matching lines @@
       location_bar_container_->GetPreferredSize().height());
 }
 
 void ToolbarView::SetLocationBarContainerBounds(
     const gfx::Rect& bounds) {
   if (location_bar_container_->IsAnimating())
     return;
 
   // LocationBarContainer is not a child of the ToolbarView.
   gfx::Point origin(bounds.origin());
-  views::View::ConvertPointToView(this, location_bar_container_->parent(),
+  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);
   }
 }