linux_aura: Right window caption buttons now match GTK.

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

 // Copyright 2013 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 CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #include "ui/views/layout/layout_manager.h"
 
@@ skipping 60 matching lines @@
   // real mode.
   int TitlebarBottomThickness(bool restored) const;
 
   // Returns the bounds of the titlebar icon (or where the icon would be if
   // there was one).
   gfx::Rect IconBounds() const;
 
   // 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:
   // Whether a specific button should be inserted on the leading or trailing
   // side.
   enum ButtonAlignment {
     ALIGN_LEADING,
     ALIGN_TRAILING
   };
 
@@ skipping 43 matching lines @@
 
   // The size of the window buttons, and the avatar menu item (if any). This
   // does not count labels or other elements that should be counted in a
   // minimal frame.
   int minimum_size_for_buttons_;
 
   // Whether any of the window control buttons were packed on the leading.
   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_;
   views::ImageButton* restore_button_;
   views::ImageButton* close_button_;
 
   views::View* window_icon_;
   views::Label* window_title_;
 
   views::View* avatar_label_;
   views::View* avatar_button_;
 
   std::vector<ButtonID> leading_buttons_;
   std::vector<ButtonID> trailing_buttons_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_