Rename bounds accessors to be intuitive and consistent

ui/views/widget/native_widget_win.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_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 783 matching lines @@
   // We implement modality by crawling up the hierarchy of windows starting
   // at the owner, disabling all of them so that they don't receive input
   // messages.
   HWND start = ::GetWindow(GetNativeView(), GW_OWNER);
   while (start) {
     ::EnableWindow(start, FALSE);
     start = ::GetParent(start);
   }
 }
 
-gfx::Rect NativeWidgetWin::GetWindowScreenBounds() const {
+gfx::Rect NativeWidgetWin::GetWindowBoundsInScreen() const {
   RECT r;
   GetWindowRect(&r);
   return gfx::Rect(r);
 }
 
-gfx::Rect NativeWidgetWin::GetClientAreaScreenBounds() const {
+gfx::Rect NativeWidgetWin::GetClientAreaBoundsInScreen() const {
   RECT r;
   GetClientRect(&r);
   POINT point = { r.left, r.top };
   ClientToScreen(hwnd(), &point);
   return gfx::Rect(point.x, point.y, r.right - r.left, r.bottom - r.top);
 }
 
 gfx::Rect NativeWidgetWin::GetRestoredBounds() const {
   // If we're in fullscreen mode, we've changed the normal bounds to the monitor
   // rect, so return the saved bounds instead.
@@ skipping 341 matching lines @@
 void NativeWidgetWin::ClearNativeFocus() {
   ::SetFocus(GetNativeView());
 }
 
 void NativeWidgetWin::FocusNativeView(gfx::NativeView native_view) {
   // Only reset focus if hwnd is not already focused.
   if (native_view && ::GetFocus() != native_view)
     ::SetFocus(native_view);
 }
 
-gfx::Rect NativeWidgetWin::GetWorkAreaScreenBounds() const {
+gfx::Rect NativeWidgetWin::GetWorkAreaBoundsInScreen() const {
   return gfx::Screen::GetDisplayNearestWindow(GetNativeView()).work_area();
 }
 
 void NativeWidgetWin::SetInactiveRenderingDisabled(bool value) {
 }
 
 Widget::MoveLoopResult NativeWidgetWin::RunMoveLoop() {
   ReleaseCapture();
   MoveLoopMouseWatcher watcher(this);
   SendMessage(hwnd(), WM_SYSCOMMAND, SC_MOVE | 0x0002, GetMessagePos());
@@ skipping 1584 matching lines @@
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   // This currently isn't necessary because we're not generating touch events on
   // windows.  When we do, this will need to be updated.
   return false;
 }
 
 }  // namespace internal
 
 }  // namespace views