x11_util: Added GetInnerWindowBounds and GetWindowExtents.

ui/base/x/x11_util.h

Index: ui/base/x/x11_util.h
diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h
index 42e928f5b02b8ba3985fb04e3a718e63c475c7c8..4b14ddb3a797d91d52e821637e4507a1d989cf98 100644
--- a/ui/base/x/x11_util.h
+++ b/ui/base/x/x11_util.h
@@ -20,7 +20,6 @@
 #include "ui/base/ui_base_export.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/gfx/point.h"
 #include "ui/gfx/x/x11_types.h"
 
 typedef unsigned long XSharedMemoryId;  // ShmSeg in the X headers.
@@ -30,6 +29,7 @@ typedef union _XEvent XEvent;
 
 namespace gfx {
 class Canvas;
+class Insets;
 class Point;
 class Rect;
 }
@@ -121,8 +121,17 @@ UI_BASE_EXPORT void ClearX11DefaultRootWindow();
 // Returns true if |window| is visible.
 UI_BASE_EXPORT bool IsWindowVisible(XID window);
 
-// Returns the bounds of |window|.
-UI_BASE_EXPORT bool GetWindowRect(XID window, gfx::Rect* rect);
+// Returns the inner bounds of |window| (excluding the non-client area).
+UI_BASE_EXPORT bool GetInnerWindowBounds(XID window, gfx::Rect* rect);
+
+// Returns the non-client area extents of |window|. This is a negative inset; it
+// represents the negative size of the window border on all sides.
+// InnerWindowBounds.Inset(WindowExtents) = OuterWindowBounds.
+// Returns false if the window manager does not provide extents information.
+UI_BASE_EXPORT bool GetWindowExtents(XID window, gfx::Insets* extents);
+
+// Returns the outer bounds of |window| (including the non-client area).
+UI_BASE_EXPORT bool GetOuterWindowBounds(XID window, gfx::Rect* rect);
 
 // Returns true if |window| contains the point |screen_loc|.
 UI_BASE_EXPORT bool WindowContainsPoint(XID window, gfx::Point screen_loc);