linux_aura: Right window caption buttons now match GTK.

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

 // 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.
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
@@ skipping 49 matching lines @@
 const int kNewTabCaptionMaximizedSpacing = 16;
 
 // The top 3 px of the tabstrip is shadow; in maximized mode we push this off
 // the top of the screen so the tabs appear flush against the screen edge.
 const int kTabstripTopShadowThickness = 3;
 
 // How far to indent the tabstrip from the left side of the screen when there
 // is no avatar icon.
 const int kTabStripIndent = -6;
 
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+// Default extra space between the top of the frame and the top of the window
+// caption buttons.
+const int kExtraCaption = 2;
+
+// Default extra spacing between individual window caption buttons.
+const int kCaptionButtonSpacing = 2;
+#else
+const int kExtraCaption = 0;
+const int kCaptionButtonSpacing = 0;
+#endif
+
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, public:
 
 OpaqueBrowserFrameViewLayout::OpaqueBrowserFrameViewLayout(
     OpaqueBrowserFrameViewLayoutDelegate* delegate)
     : delegate_(delegate),
       leading_button_start_(0),
       trailing_button_start_(0),
       minimum_size_for_buttons_(0),
       has_leading_buttons_(false),
       has_trailing_buttons_(false),
+      extra_caption_y_(kExtraCaption),
+      window_caption_spacing_(kCaptionButtonSpacing),
       minimize_button_(NULL),
       maximize_button_(NULL),
       restore_button_(NULL),
       close_button_(NULL),
       window_icon_(NULL),
       window_title_(NULL),
       avatar_label_(NULL),
       avatar_button_(NULL) {
   trailing_buttons_.push_back(BUTTON_MINIMIZE);
   trailing_buttons_.push_back(BUTTON_MAXIMIZE);
@@ skipping 109 matching lines @@
 
 int OpaqueBrowserFrameViewLayout::TitlebarBottomThickness(bool restored) const {
   return kTitlebarTopAndBottomEdgeThickness +
       ((!restored && delegate_->IsMaximized()) ? 0 :
        views::NonClientFrameView::kClientEdgeThickness);
 }
 
 int OpaqueBrowserFrameViewLayout::CaptionButtonY(bool restored) const {
   // Maximized buttons start at window top so that even if their images aren't
   // drawn flush with the screen edge, they still obey Fitts' Law.
-  return (!restored && delegate_->IsMaximized()) ?
+  return ((!restored && delegate_->IsMaximized()) ?
       FrameBorderThickness(false) :
-      views::NonClientFrameView::kFrameShadowThickness;
+          views::NonClientFrameView::kFrameShadowThickness) + extra_caption_y_;
 }
 
 gfx::Rect OpaqueBrowserFrameViewLayout::IconBounds() const {
   return window_icon_bounds_;
 }
 
 gfx::Rect OpaqueBrowserFrameViewLayout::CalculateClientAreaBounds(
     int width,
     int height) const {
   int top_height = NonClientTopBorderHeight(false);
@@ skipping 207 matching lines @@
           views::ImageButton::ALIGN_RIGHT : views::ImageButton::ALIGN_LEFT,
       views::ImageButton::ALIGN_BOTTOM);
 
   // There should always be the same number of non-shadow pixels visible to the
   // side of the caption buttons.  In maximized mode we extend the rightmost
   // button to the screen corner to obey Fitts' Law.
   bool is_maximized = delegate_->IsMaximized();
 
   switch (alignment) {
     case ALIGN_LEADING: {
-      // TODO(erg): This works well enough as a basic case, but needs to be
-      // expanded for Linux. Inter-button spacing, for example. Also, extending
-      // the leading edge of the first button all the way to the leading edge.
+      if (has_leading_buttons_)
+        leading_button_start_ += window_caption_spacing_;
+
+      // If we're the first button on the left and maximized, add with to the
+      // right hand side of the screen.
+      int extra_width = (is_maximized && !has_leading_buttons_) ?
+        (kFrameBorderThickness -
+         views::NonClientFrameView::kFrameShadowThickness) : 0;
+
       button->SetBounds(
-          leading_button_start_,
+          leading_button_start_ - extra_width,
           caption_y,
-          button_size.width(),
+          button_size.width() + extra_width,
           button_size.height());
 
-      leading_button_start_ += button_size.width();
-      minimum_size_for_buttons_ += button_size.width();
+      leading_button_start_ += extra_width + button_size.width();
+      minimum_size_for_buttons_ += extra_width + button_size.width();
       has_leading_buttons_ = true;
       break;
     }
     case ALIGN_TRAILING: {
+      if (has_trailing_buttons_)
+        trailing_button_start_ += window_caption_spacing_;
+
       // If we're the first button on the right and maximized, add with to the
       // right hand side of the screen.
       int extra_width = (is_maximized && !has_trailing_buttons_) ?
         (kFrameBorderThickness -
          views::NonClientFrameView::kFrameShadowThickness) : 0;
 
       button->SetBounds(
           host->width() - trailing_button_start_ - extra_width -
               button_size.width(),
           caption_y,
@@ skipping 99 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), NULL);
 }