Convert Aura to use ui::Event.

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 950 matching lines @@
   // BrowserWindow may not contain contents during startup on the lock screen.
   if (!browser_window || !browser_window->Contains(contents_view))
     return;
 
   gfx::Size contents_size(contents_view->bounds().size());
   gfx::Rect location_rect = chrome::search::GetNTPOmniboxBounds(contents_size);
   if (location_rect.width() == 0)
     return;
 
   gfx::Point location_container_origin;
-  aura::Window::ConvertPointToWindow(
+  aura::Window::ConvertPointToTarget(
       contents_view, browser_window, &location_container_origin);
   views::View::ConvertPointFromWidget(location_bar_container_->parent(),
                                       &location_container_origin);
   location_container_origin =
       location_container_origin.Add(location_rect.origin());
 #else
   // Get screen bounds of web contents page.
   gfx::Rect web_rect_in_screen;
   if (contents && contents->GetView())
     contents->GetView()->GetContainerBounds(&web_rect_in_screen);
@@ skipping 29 matching lines @@
   // LocationBarContainer is not a child of the ToolbarView.
   gfx::Point origin(bounds.origin());
   views::View::ConvertPointToView(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);
   }
 }