Rename bounds accessors to be intuitive and consistent

ash/system/tray/system_tray_bubble.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 "ash/system/tray/system_tray_bubble.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 333 matching lines @@
 
 void SystemTrayBubble::BubbleViewDestroyed() {
   DestroyItemViews();
   bubble_view_ = NULL;
 }
 
 gfx::Rect SystemTrayBubble::GetAnchorRect() const {
   gfx::Rect rect;
   views::Widget* widget = bubble_view()->anchor_widget();
   if (widget->IsVisible()) {
-    rect = widget->GetWindowScreenBounds();
+    rect = widget->GetWindowBoundsInScreen();
     if (anchor_type_ == ANCHOR_TYPE_TRAY) {
       if (tray_->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
         rect.Inset(
             base::i18n::IsRTL() ?
                 kPaddingFromRightEdgeOfScreenBottomAlignment : 0,
             0,
             base::i18n::IsRTL() ?
                 0 : kPaddingFromRightEdgeOfScreenBottomAlignment,
             kPaddingFromBottomOfScreenBottomAlignment);
       } else if (tray_->shelf_alignment() == SHELF_ALIGNMENT_LEFT) {
         rect.Inset(0, 0, kPaddingFromInnerEdgeOfLauncherVerticalAlignment,
                    kPaddingFromBottomOfScreenVerticalAlignment);
       } else {
         rect.Inset(kPaddingFromInnerEdgeOfLauncherVerticalAlignment,
                    0, 0, kPaddingFromBottomOfScreenVerticalAlignment);
       }
     } else if (anchor_type_ == ANCHOR_TYPE_BUBBLE) {
       // For notification bubble to be anchored with uber tray bubble,
       // the anchor can include arrow on left or right, which should
       // be deducted out from the anchor rect.
       views::View* anchor_view = bubble_view()->anchor_view();
-      rect = anchor_view->GetScreenBounds();
+      rect = anchor_view->GetBoundsInScreen();
       gfx::Insets insets = anchor_view->GetInsets();
       rect.Inset(insets);
     }
   }
   return rect;
 }
 
 void SystemTrayBubble::OnMouseEnteredView() {
   StopAutoCloseTimer();
 }
@@ skipping 86 matching lines @@
 }
 
 void SystemTrayBubble::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(bubble_widget_, widget);
   bubble_widget_ = NULL;
   tray_->RemoveBubble(this);
 }
 
 }  // namespace internal
 }  // namespace ash