Merge r12900....

chrome/views/window/custom_frame_view.cc

 // Copyright (c) 2009 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/views/window/custom_frame_view.h"
 
 #include "base/win_util.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
@@ skipping 299 matching lines @@
       NonClientBorderThickness(), kResizeAreaCornerSize, kResizeAreaCornerSize,
       frame_->GetDelegate()->CanResize());
   // Fall back to the caption if no other component matches.
   return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
 }
 
 void CustomFrameView::GetWindowMask(const gfx::Size& size,
                                     gfx::Path* window_mask) {
   DCHECK(window_mask);
 
+  if (frame_->IsMaximized())
+    return;
+
   // Redefine the window visible region for the new size.
   window_mask->moveTo(0, 3);
   window_mask->lineTo(1, 2);
   window_mask->lineTo(1, 1);
   window_mask->lineTo(2, 1);
   window_mask->lineTo(3, 0);
 
   window_mask->lineTo(SkIntToScalar(size.width() - 3), 0);
   window_mask->lineTo(SkIntToScalar(size.width() - 2), 1);
   window_mask->lineTo(SkIntToScalar(size.width() - 1), 1);
@@ skipping 55 matching lines @@
   else if (sender == maximize_button_)
     frame_->Maximize();
   else if (sender == restore_button_)
     frame_->Restore();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameView, private:
 
 int CustomFrameView::FrameBorderThickness() const {
-  return frame_->IsMaximized() ?
-      GetSystemMetrics(SM_CXSIZEFRAME) : kFrameBorderThickness;
+  return frame_->IsMaximized() ? 0 : kFrameBorderThickness;
 }
 
 int CustomFrameView::NonClientBorderThickness() const {
   // In maximized mode, we don't show a client edge.
   return FrameBorderThickness() +
       (frame_->IsMaximized() ? 0 : kClientEdgeThickness);
 }
 
 int CustomFrameView::NonClientTopBorderHeight() const {
   int title_top_spacing, title_thickness;
@@ skipping 156 matching lines @@
   // drawn flush with the screen edge, they still obey Fitts' Law.
   bool is_maximized = frame_->IsMaximized();
   int frame_thickness = FrameBorderThickness();
   int caption_y = is_maximized ? frame_thickness : kCaptionTopSpacing;
   int top_extra_height = is_maximized ? kCaptionTopSpacing : 0;
   // 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.
   int right_extra_width = is_maximized ?
       (kFrameBorderThickness - kFrameShadowThickness) : 0;
-  int right_spacing = is_maximized ?
-      (GetSystemMetrics(SM_CXSIZEFRAME) + right_extra_width) : frame_thickness;
   gfx::Size close_button_size = close_button_->GetPreferredSize();
-  close_button_->SetBounds(width() - close_button_size.width() - right_spacing,
-                           caption_y,
-                           close_button_size.width() + right_extra_width,
-                           close_button_size.height() + top_extra_height);
+  close_button_->SetBounds(width() - close_button_size.width() -
+      right_extra_width - frame_thickness, caption_y,
+      close_button_size.width() + right_extra_width,
+      close_button_size.height() + top_extra_height);
 
   // When the window is restored, we show a maximized button; otherwise, we show
   // a restore button.
   bool is_restored = !is_maximized && !frame_->IsMinimized();
   views::ImageButton* invisible_button = is_restored ?
       restore_button_ : maximize_button_;
   invisible_button->SetVisible(false);
 
   views::ImageButton* visible_button = is_restored ?
       maximize_button_ : restore_button_;
@@ skipping 98 matching lines @@
     active_resources_ = new ActiveWindowResources;
     inactive_resources_ = new InactiveWindowResources;
 
     title_font_ = win_util::GetWindowTitleFont();
 
     initialized = true;
   }
 }
 
 }  // namespace views