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

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h
===================================================================
--- chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h	(revision 130125)
+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h	(working copy)
@@ -81,8 +81,9 @@
   // theme image, or the bitmap for |fallback_bitmap_id| if not.
   SkBitmap* GetCustomBitmap(int bitmap_id, int fallback_bitmap_id) const;
 
-  // Window controls.
-  views::ImageButton* maximize_button_;
+  // Window controls. The |size_button_| either toggles maximized or toggles
+  // minimized. The exact behavior is determined by |size_button_minimizes_|.
+  views::ImageButton* size_button_;
   views::ImageButton* close_button_;
 
   // For popups, the window icon.
@@ -91,6 +92,10 @@
   // Painter for the frame header.
   scoped_ptr<ash::FramePainter> frame_painter_;
 
+  // If true the |size_button_| minimizes, otherwise it toggles between
+  // maximized and restored.
+  bool size_button_minimizes_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);
 };