Replace views::LocatedEvent with ui::LocatedEvent

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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/ash/browser_non_client_frame_view_ash.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 219 matching lines @@
                                                         client_bounds);
 }
 
 int BrowserNonClientFrameViewAsh::NonClientHitTest(const gfx::Point& point) {
   int hit_test = frame_painter_->NonClientHitTest(this, point);
   // When the window is restored we want a large click target above the tabs
   // to drag the window, so redirect clicks in the tab's shadow to caption.
   if (hit_test == HTCLIENT && !frame()->IsMaximized()) {
     // Convert point to client coordinates.
     gfx::Point client_point(point);
-    View::ConvertPointToView(this, frame()->client_view(), &client_point);
+    View::ConvertPointToTarget(this, frame()->client_view(), &client_point);
     // Report hits in shadow at top of tabstrip as caption.
     gfx::Rect tabstrip_bounds(browser_view()->tabstrip()->bounds());
     if (client_point.y() < tabstrip_bounds.y() + tab_shadow_height())
       hit_test = HTCAPTION;
   }
   return hit_test;
 }
 
 void BrowserNonClientFrameViewAsh::GetWindowMask(const gfx::Size& size,
                                                   gfx::Path* window_mask) {
@@ skipping 84 matching lines @@
 bool BrowserNonClientFrameViewAsh::HitTestRect(const gfx::Rect& rect) const {
   // If the rect is outside the bounds of the client area, claim it.
   if (NonClientFrameView::HitTestRect(rect))
     return true;
 
   // Otherwise claim it only if it's in a non-tab portion of the tabstrip.
   if (!browser_view()->tabstrip())
     return false;
   gfx::Rect tabstrip_bounds(browser_view()->tabstrip()->bounds());
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
-  View::ConvertPointToView(frame()->client_view(), this, &tabstrip_origin);
+  View::ConvertPointToTarget(frame()->client_view(), this, &tabstrip_origin);
   tabstrip_bounds.set_origin(tabstrip_origin);
   if (rect.bottom() > tabstrip_bounds.bottom())
     return false;
 
   // We convert from our parent's coordinates since we assume we fill its bounds
   // completely. We need to do this since we're not a parent of the tabstrip,
-  // meaning ConvertPointToView would otherwise return something bogus.
+  // meaning ConvertPointToTarget would otherwise return something bogus.
   // TODO(tdanderson): Initialize |browser_view_point| using |rect| instead of
   // its center point once GetEventHandlerForRect() is implemented.
   gfx::Point browser_view_point(rect.CenterPoint());
-  View::ConvertPointToView(parent(), browser_view(), &browser_view_point);
+  View::ConvertPointToTarget(parent(), browser_view(), &browser_view_point);
   return browser_view()->IsPositionInWindowCaption(browser_view_point);
 }
 
 void BrowserNonClientFrameViewAsh::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_TITLEBAR;
 }
 
 gfx::Size BrowserNonClientFrameViewAsh::GetMinimumSize() {
   return frame_painter_->GetMinimumSize(this);
@@ skipping 123 matching lines @@
   avatar_button()->SetBoundsRect(avatar_bounds);
 }
 
 void BrowserNonClientFrameViewAsh::PaintToolbarBackground(
     gfx::Canvas* canvas,
     chrome::search::Mode::Type mode) {
   gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
   if (toolbar_bounds.IsEmpty())
     return;
   gfx::Point toolbar_origin(toolbar_bounds.origin());
-  ConvertPointToView(browser_view(), this, &toolbar_origin);
+  View::ConvertPointToTarget(browser_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
 
   int x = toolbar_bounds.x();
   int w = toolbar_bounds.width();
   int y = toolbar_bounds.y();
   int h = toolbar_bounds.height();
 
   // Gross hack: We split the toolbar images into two pieces, since sometimes
   // (popup mode) the toolbar isn't tall enough to show the whole image.  The
   // split happens between the top shadow section and the bottom gradient
@@ skipping 95 matching lines @@
 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
   return NULL;
 }