Rename bounds accessors to be intuitive and consistent

ash/wm/workspace/phantom_window_controller.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/wm/workspace/phantom_window_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/aura/window.h"
@@ skipping 68 matching lines @@
   Hide();
 }
 
 void PhantomWindowController::Show(const gfx::Rect& bounds) {
   if (bounds == bounds_)
     return;
   bounds_ = bounds;
   if (!phantom_widget_.get()) {
     // Show the phantom at the bounds of the window. We'll animate to the target
     // bounds.
-    start_bounds_ = window_->GetScreenBounds();
+    start_bounds_ = window_->GetBoundsInScreen();
     CreatePhantomWidget(start_bounds_);
   } else {
-    start_bounds_ = phantom_widget_->GetWindowScreenBounds();
+    start_bounds_ = phantom_widget_->GetWindowBoundsInScreen();
   }
   animation_.reset(new ui::SlideAnimation(this));
   animation_->Show();
 }
 
 void PhantomWindowController::SetBounds(const gfx::Rect& bounds) {
   DCHECK(IsShowing());
   animation_.reset();
   bounds_ = bounds;
   phantom_widget_->SetBounds(bounds_);
@@ skipping 40 matching lines @@
   phantom_widget_->Show();
   // Fade the window in.
   ui::Layer* layer = phantom_widget_->GetNativeWindow()->layer();
   layer->SetOpacity(0);
   ui::ScopedLayerAnimationSettings scoped_setter(layer->GetAnimator());
   layer->SetOpacity(1);
 }
 
 }  // namespace internal
 }  // namespace ash