Rename bounds accessors to be intuitive and consistent

ui/views/widget/widget.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 285 matching lines @@
   WidgetDelegate* widget_delegate() const { return widget_delegate_; }
 
   // Sets the specified view as the contents of this Widget. There can only
   // be one contents view child of this Widget's RootView. This view is sized to
   // fit the entire size of the RootView. The RootView takes ownership of this
   // View, unless it is set as not being parent-owned.
   void SetContentsView(View* view);
   View* GetContentsView();
 
   // Returns the bounds of the Widget in screen coordinates.
-  gfx::Rect GetWindowScreenBounds() const;
+  gfx::Rect GetWindowBoundsInScreen() const;
 
   // Returns the bounds of the Widget's client area in screen coordinates.
-  gfx::Rect GetClientAreaScreenBounds() const;
+  gfx::Rect GetClientAreaBoundsInScreen() const;
 
   // Retrieves the restored bounds for the window.
   gfx::Rect GetRestoredBounds() const;
 
   // Sizes and/or places the widget to the specified bounds, size or position.
   void SetBounds(const gfx::Rect& bounds);
   void SetSize(const gfx::Size& size);
 
   // Sizes the window to the specified size and centerizes it.
   void CenterWindow(const gfx::Size& size);
@@ skipping 289 matching lines @@
   // if it exists and the root view otherwise.
   virtual View* GetChildViewParent();
 
   // True if the widget is considered top level widget. Top level widget
   // is a widget of TYPE_WINDOW, TYPE_PANEL, TYPE_WINDOW_FRAMELESS, BUBBLE,
   // POPUP or MENU, and has a focus manager and input method object associated
   // with it. TYPE_CONTROL and TYPE_TOOLTIP is not considered top level.
   bool is_top_level() const { return is_top_level_; }
 
   // Returns the work are bounds of the screen the Widget belongs to.
-  gfx::Rect GetWorkAreaScreenBounds() const;
+  gfx::Rect GetWorkAreaBoundsInScreen() const;
 
   // Notification that our owner is closing.
   // NOTE: this is not invoked for aura as it's currently not needed there.
   // Under aura menus close by way of activation getting reset when the owner
   // closes.
   virtual void OnOwnerClosing();
 
   // Overridden from NativeWidgetDelegate:
   virtual bool IsModal() const OVERRIDE;
   virtual bool IsDialogBox() const OVERRIDE;
@@ skipping 174 matching lines @@
 
   // Is |root_layers_| out of date?
   bool root_layers_dirty_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_