Rename bounds accessors to be intuitive and consistent

ui/aura/window.h

Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index d9bc9b19051503eab69ebdff2683974c70ed3ece..ede2c717e80db82772815e166610b2611e50917a 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -132,13 +132,13 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
   bool TargetVisibility() const { return visible_; }
 
   // Returns the window's bounds in root window's coordinates.
-  gfx::Rect GetRootWindowBounds() const;
+  gfx::Rect GetBoundsInRootWindow() const;
 
   // Returns the window's bounds in screen coordinates.
   // How the root window's coordinates is mapped to screen's coordinates
   // is platform dependent and defined in the implementation of the
   // |aura::client::ScreenPositionClient| interface.
-  gfx::Rect GetScreenBounds() const;
+  gfx::Rect GetBoundsInScreen() const;
 
   virtual void SetTransform(const ui::Transform& transform);
 
@@ -153,7 +153,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
 
   // Changes the bounds of the window in the screen coordintates.
   // If present, the window's parent's LayoutManager may adjust the bounds.
-  void SetScreenBounds(const gfx::Rect& new_bounds_in_screen_coords);
+  void SetBoundsInScreen(const gfx::Rect& new_bounds_in_screen_coords);
 
   // Returns the target bounds of the window. If the window's layer is
   // not animating, it simply returns the current bounds.