linux_aura: Right window caption buttons now match GTK.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
index 74f100c687fdf4fd65b9b2ee43cc1c9586c8fae7..2b83c8c4bb5aff520fab44681ce2fac23162e6c6 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -78,6 +78,14 @@ class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds(int width, int height) const;
 
+  void set_extra_caption_y(int extra_caption_y) {
+    extra_caption_y_ = extra_caption_y;
+  }
+
+  void set_window_caption_spacing(int window_caption_spacing) {
+    window_caption_spacing_ = window_caption_spacing;
+  }
+
   const gfx::Rect& client_view_bounds() const { return client_view_bounds_; }
 
  private:
@@ -141,6 +149,13 @@ class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
   bool has_leading_buttons_;
   bool has_trailing_buttons_;
 
+  // Extra offset from the top of the frame to the top of the window control
+  // buttons. Configurable based on platform and whether we are under test.
+  int extra_caption_y_;
+
+  // Extra offset between the individual window caption buttons.
+  int window_caption_spacing_;
+
   // Window controls.
   views::ImageButton* minimize_button_;
   views::ImageButton* maximize_button_;