Rename bounds accessors to be intuitive and consistent

ash/system/tray/system_tray.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.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
@@ skipping 332 matching lines @@
 }
 
 void SystemTray::RemoveBubble(SystemTrayBubble* bubble) {
   if (bubble == bubble_.get()) {
     DestroyBubble();
     UpdateNotificationBubble();  // State changed, re-create notifications.
     if (should_show_launcher_) {
       // No need to show the launcher if the mouse isn't over the status area
       // anymore.
       aura::RootWindow* root = GetWidget()->GetNativeView()->GetRootWindow();
-      should_show_launcher_ = GetWidget()->GetWindowScreenBounds().Contains(
+      should_show_launcher_ = GetWidget()->GetWindowBoundsInScreen().Contains(
           root->last_mouse_location());
       if (!should_show_launcher_)
         Shell::GetInstance()->shelf()->UpdateAutoHideState();
     }
   } else if (bubble == notification_bubble_) {
     notification_bubble_.reset();
   } else {
     NOTREACHED();
   }
 }
@@ skipping 214 matching lines @@
 
 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // The tray itself expands to the right and bottom edge of the screen to make
   // sure clicking on the edges brings up the popup. However, the focus border
   // should be only around the container.
   if (GetWidget() && GetWidget()->IsActive())
     canvas->DrawFocusRect(tray_container_->bounds());
 }
 
 }  // namespace ash