Rename bounds accessors to be intuitive and consistent

chrome/browser/ui/views/find_bar_host.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/find_bar_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
@@ skipping 202 matching lines @@
       // This is tricky due to asynchronous nature of x11.
       // See bug http://crbug.com/28629.
 #endif
     if (position)
       *position = gfx::Point();
     if (fully_visible)
       *fully_visible = false;
     return false;
   }
 
-  gfx::Rect window_rect = host()->GetWindowScreenBounds();
+  gfx::Rect window_rect = host()->GetWindowBoundsInScreen();
   if (position)
     *position = window_rect.origin();
   if (fully_visible)
     *fully_visible = IsVisible() && !IsAnimating();
   return true;
 }
 
 string16 FindBarHost::GetFindText() {
   return find_bar_view()->GetFindText();
 }
@@ skipping 90 matching lines @@
   ui::Accelerator escape(ui::VKEY_RETURN, ui::EF_CONTROL_DOWN);
   focus_manager()->UnregisterAccelerator(escape, this);
 
   DropdownBarHost::UnregisterAccelerators();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private:
 
 void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) {
-  gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowScreenBounds();
+  gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowBoundsInScreen();
   content::WebContentsView* tab_view =
       find_bar_controller_->tab_contents()->web_contents()->GetView();
   gfx::Rect webcontents_rect = tab_view->GetViewBounds();
   avoid_overlapping_rect->Offset(0, webcontents_rect.y() - frame_rect.y());
 }
 
 FindBarView* FindBarHost::find_bar_view() {
   return static_cast<FindBarView*>(view());
 }