Rename bounds accessors to be intuitive and consistent

ui/views/widget/widget.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/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
@@ skipping 397 matching lines @@
     return;
   root_view_->SetContentsView(view);
   if (non_client_view_ != view)
     non_client_view_ = NULL;
 }
 
 View* Widget::GetContentsView() {
   return root_view_->GetContentsView();
 }
 
-gfx::Rect Widget::GetWindowScreenBounds() const {
-  return native_widget_->GetWindowScreenBounds();
+gfx::Rect Widget::GetWindowBoundsInScreen() const {
+  return native_widget_->GetWindowBoundsInScreen();
 }
 
-gfx::Rect Widget::GetClientAreaScreenBounds() const {
-  return native_widget_->GetClientAreaScreenBounds();
+gfx::Rect Widget::GetClientAreaBoundsInScreen() const {
+  return native_widget_->GetClientAreaBoundsInScreen();
 }
 
 gfx::Rect Widget::GetRestoredBounds() const {
   return native_widget_->GetRestoredBounds();
 }
 
 void Widget::SetBounds(const gfx::Rect& bounds) {
   native_widget_->SetBounds(bounds);
 }
 
@@ skipping 450 matching lines @@
   View* v = widget_delegate_->GetInitiallyFocusedView();
   if (v)
     v->RequestFocus();
   return !!v;
 }
 
 View* Widget::GetChildViewParent() {
   return GetContentsView() ? GetContentsView() : GetRootView();
 }
 
-gfx::Rect Widget::GetWorkAreaScreenBounds() const {
-  return native_widget_->GetWorkAreaScreenBounds();
+gfx::Rect Widget::GetWorkAreaBoundsInScreen() const {
+  return native_widget_->GetWorkAreaBoundsInScreen();
 }
 
 void Widget::OnOwnerClosing() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, NativeWidgetDelegate implementation:
 
 bool Widget::IsModal() const {
   return widget_delegate_->GetModalType() != ui::MODAL_TYPE_NONE;
@@ skipping 118 matching lines @@
   if (GetRootView()->layer()) {
     const ui::Transform& layer_transform = GetRootView()->layer()->transform();
     if (layer_transform != GetRootView()->GetTransform()) {
       // The layer has not caught up to the view (i.e., the layer is still
       // animating), and so a clear is required.
       force_clear = true;
     } else {
       // Determine if the layer fills the client area.
       gfx::Rect layer_bounds = GetRootView()->layer()->bounds();
       layer_transform.TransformRect(&layer_bounds);
-      gfx::Rect client_bounds = GetClientAreaScreenBounds();
+      gfx::Rect client_bounds = GetClientAreaBoundsInScreen();
       // Translate bounds to origin (client area bounds are offset to account
       // for buttons, etc).
       client_bounds.set_origin(gfx::Point(0, 0));
       if (!layer_bounds.Contains(client_bounds)) {
         // It doesn't, and so a clear is required.
         force_clear = true;
       }
     }
   }
 
@@ skipping 281 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views