Merge 130064 - Changes the maximize button to only minimize for panels. This resulted

ash/wm/custom_frame_view_ash.cc

 // Copyright (c) 2012 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 "ash/wm/custom_frame_view_ash.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"  // Accessibility names
@@ skipping 49 matching lines @@
       l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
   AddChildView(close_button_);
 
   maximize_button_->SetVisible(frame_->widget_delegate()->CanMaximize());
 
   if (frame_->widget_delegate()->ShouldShowWindowIcon()) {
     window_icon_ = new views::ImageButton(this);
     AddChildView(window_icon_);
   }
 
-  frame_painter_->Init(frame_, window_icon_, maximize_button_, close_button_);
+  frame_painter_->Init(frame_, window_icon_, maximize_button_, close_button_,
+                       FramePainter::SIZE_BUTTON_MAXIMIZES);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, views::NonClientFrameView overrides:
 gfx::Rect CustomFrameViewAsh::GetBoundsForClientView() const {
   int top_height = NonClientTopBorderHeight();
   return frame_painter_->GetBoundsForClientView(top_height,
                                                 bounds());
 }
 
@@ skipping 82 matching lines @@
 // CustomFrameViewAsh, private:
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   // Reserve enough space to see the buttons, including any offset from top and
   // reserving space for the separator line.
   return close_button_->bounds().bottom() +
       frame_painter_->HeaderContentSeparatorSize();
 }
 
 }  // namespace ash