Rename bounds accessors to be intuitive and consistent

ui/views/widget/native_widget_aura.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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_change_observer.h"
@@ skipping 330 matching lines @@
 InputMethod* NativeWidgetAura::CreateInputMethod() {
   aura::RootWindow* root_window = window_->GetRootWindow();
   ui::InputMethod* host =
       root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
   InputMethod* input_method = new InputMethodBridge(this, host);
   input_method->Init(GetWidget());
   return input_method;
 }
 
 void NativeWidgetAura::CenterWindow(const gfx::Size& size) {
-  gfx::Rect parent_bounds(window_->parent()->GetRootWindowBounds());
+  gfx::Rect parent_bounds(window_->parent()->GetBoundsInRootWindow());
   // When centering window, we take the intersection of the host and
   // the parent. We assume the root window represents the visible
   // rect of a single screen.
   gfx::Rect work_area =
       gfx::Screen::GetDisplayNearestWindow(window_).work_area();
 
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(window_->GetRootWindow());
   if (screen_position_client) {
     gfx::Point origin = work_area.origin();
     screen_position_client->ConvertPointFromScreen(window_->parent(),
                                                    &origin);
     work_area.set_origin(origin);
   }
 
   parent_bounds = parent_bounds.Intersect(work_area);
 
   // If |window_|'s transient parent's bounds are big enough to fit it, then we
   // center it with respect to the transient parent.
   if (window_->transient_parent()) {
     gfx::Rect transient_parent_rect = window_->transient_parent()->
-        GetRootWindowBounds().Intersect(work_area);
+        GetBoundsInRootWindow().Intersect(work_area);
     if (transient_parent_rect.height() >= size.height() &&
         transient_parent_rect.width() >= size.width())
       parent_bounds = transient_parent_rect;
   }
 
   gfx::Rect window_bounds(
       parent_bounds.x() + (parent_bounds.width() - size.width()) / 2,
       parent_bounds.y() + (parent_bounds.height() - size.height()) / 2,
       size.width(),
       size.height());
@@ skipping 37 matching lines @@
 void NativeWidgetAura::SetAccessibleState(ui::AccessibilityTypes::State state) {
   // http://crbug.com/102570
   // NOTIMPLEMENTED();
 }
 
 void NativeWidgetAura::InitModalType(ui::ModalType modal_type) {
   if (modal_type != ui::MODAL_TYPE_NONE)
     window_->SetProperty(aura::client::kModalKey, modal_type);
 }
 
-gfx::Rect NativeWidgetAura::GetWindowScreenBounds() const {
-  return window_->GetScreenBounds();
+gfx::Rect NativeWidgetAura::GetWindowBoundsInScreen() const {
+  return window_->GetBoundsInScreen();
 }
 
-gfx::Rect NativeWidgetAura::GetClientAreaScreenBounds() const {
+gfx::Rect NativeWidgetAura::GetClientAreaBoundsInScreen() const {
   // View-to-screen coordinate system transformations depend on this returning
   // the full window bounds, for example View::ConvertPointToScreen().
-  return window_->GetScreenBounds();
+  return window_->GetBoundsInScreen();
 }
 
 gfx::Rect NativeWidgetAura::GetRestoredBounds() const {
   // Restored bounds should only be relevant if the window is minimized or
   // maximized. However, in some places the code expectes GetRestoredBounds()
   // to return the current window bounds if the window is not in either state.
   if (!IsMinimized() && !IsMaximized() && !IsFullscreen())
     return window_->bounds();
   gfx::Rect* restore_bounds =
       window_->GetProperty(aura::client::kRestoreBoundsKey);
@@ skipping 194 matching lines @@
 void NativeWidgetAura::ClearNativeFocus() {
   if (window_ && window_->GetFocusManager() &&
       window_->Contains(window_->GetFocusManager()->GetFocusedWindow()))
     window_->GetFocusManager()->SetFocusedWindow(window_, NULL);
 }
 
 void NativeWidgetAura::FocusNativeView(gfx::NativeView native_view) {
   window_->GetFocusManager()->SetFocusedWindow(native_view, NULL);
 }
 
-gfx::Rect NativeWidgetAura::GetWorkAreaScreenBounds() const {
+gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const {
   return gfx::Screen::GetDisplayNearestWindow(GetNativeView()).work_area();
 }
 
 void NativeWidgetAura::SetInactiveRenderingDisabled(bool value) {
   if (!value)
     active_window_observer_.reset();
   else
     active_window_observer_.reset(new ActiveWindowObserver(this));
 }
 
@@ skipping 382 matching lines @@
   return aura::Env::GetInstance()->is_mouse_button_down();
 }
 
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
 }  // namespace internal
 }  // namespace views