Cleanup adding BoundsInWidget to View to convert callers...

chrome/browser/views/find_bar_win.cc

 // Copyright (c) 2006-2008 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/views/find_bar_win.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/render_view_host.h"
@@ skipping 469 matching lines @@
   *bounds = gfx::Rect(browser_client_rect);
 
   // Find the dimensions of the toolbar and the BookmarkBar.
   gfx::Rect toolbar_bounds, bookmark_bar_bounds;
   if (toolbar) {
     toolbar_bounds = toolbar->GetLocalBounds(false);
     // Need to convert toolbar bounds into Widget coords because the toolbar
     // is the child of another view that isn't the top level view. This is
     // required to ensure correct positioning relative to the top,left of the
     // window.
-    gfx::Point topleft;
-    views::View::ConvertPointToWidget(toolbar, &topleft);
-    toolbar_bounds.Offset(topleft.x(), topleft.y());
+    gfx::Rect widget_bounds = toolbar->BoundsInWidget();
+    toolbar_bounds.Offset(widget_bounds.x(), widget_bounds.y());
   }
 
   // If the bookmarks bar is available, we need to update our
   // position and paint accordingly
   if (bookmark_bar) {
     if (bookmark_bar->IsAlwaysShown()) {
       // If it's always on, don't try to blend with the toolbar.
       view_->SetToolbarBlend(false);
     } else {
       // Else it's on, but hidden (in which case we should try
@@ skipping 176 matching lines @@
   // TODO(finnur): Once we fix issue 1307173 we should not remember any old
   // accelerator targets and just Register and Unregister when needed.
   DCHECK(old_accel_target_for_esc_ != NULL);
   views::Accelerator escape(VK_ESCAPE, false, false, false);
   views::AcceleratorTarget* current_target =
       focus_manager_->GetTargetForAccelerator(escape);
   if (current_target == this)
     focus_manager_->RegisterAccelerator(escape, old_accel_target_for_esc_);
 }