Rename bounds accessors to be intuitive and consistent

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 420 matching lines @@
       return tabstrip_top_spacing_short();
     return tabstrip_top_spacing_tall();
   }
   // For windows without a tab strip (popups, etc.) ensure we have enough space
   // to see the window caption buttons.
   return close_button_->bounds().bottom() - kContentShadowHeight;
 }
 
 bool BrowserNonClientFrameViewAsh::UseShortHeader() const {
   // Window at top of screen -> short header
-  if (frame()->GetWindowScreenBounds().y() == 0)
+  if (frame()->GetWindowBoundsInScreen().y() == 0)
     return true;
   // Restored browser -> tall header
   // Maximized browser -> short header
   // App window -> tall header
   // Popup window -> short header
   // Panel -> short header
   // Dialogs use short header and are handled via CustomFrameViewAsh.
   Browser* browser = browser_view()->browser();
   switch (browser->type()) {
     case Browser::TYPE_TABBED:
@@ skipping 140 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;
 }