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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
@@ skipping 63 matching lines @@
 
   // Returns the correct bitmap for the frame header based on activation state
   // and incognito mode.
   const SkBitmap* GetThemeFrameBitmap() const;
   const SkBitmap* GetThemeFrameOverlayBitmap() const;
 
   // Returns the theme image bitmap for |bitmap_id| if the user has a custom
   // 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.
   TabIconView* window_icon_;
 
   // 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);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_