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

ash/wm/frame_painter.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 ASH_WM_FRAME_PAINTER_H_
 #define ASH_WM_FRAME_PAINTER_H_
 #pragma once
 
 #include <set>
 
@@ skipping 36 matching lines @@
   // Opacity values for the window header in various states, from 0 to 255.
   static int kActiveWindowOpacity;
   static int kInactiveWindowOpacity;
   static int kSoloWindowOpacity;
 
   enum HeaderMode {
     ACTIVE,
     INACTIVE
   };
 
+  // What happens when the |size_button_| is pressed.
+  enum SizeButtonBehavior {
+    SIZE_BUTTON_MINIMIZES,
+    SIZE_BUTTON_MAXIMIZES
+  };
+
   FramePainter();
   virtual ~FramePainter();
 
   // |frame| and buttons are used for layout and are not owned.
   void Init(views::Widget* frame,
             views::View* window_icon,
-            views::ImageButton* maximize_button,
-            views::ImageButton* close_button);
+            views::ImageButton* size_button,
+            views::ImageButton* close_button,
+            SizeButtonBehavior behavior);
 
   // Helpers for views::NonClientFrameView implementations.
   gfx::Rect GetBoundsForClientView(int top_height,
                                    const gfx::Rect& window_bounds) const;
   gfx::Rect GetWindowBoundsForClientBounds(
       int top_height,
       const gfx::Rect& client_bounds) const;
   int NonClientHitTest(views::NonClientFrameView* view,
                        const gfx::Point& point);
   gfx::Size GetMinimumSize(views::NonClientFrameView* view);
@@ skipping 46 matching lines @@
   // default window container, in which case we should paint a transparent
   // window header.  Does not count window |ignore|.  Pass NULL for |ignore|
   // to check all windows.
   bool UseSoloWindowHeader(aura::Window* ignore) const;
 
   static std::set<FramePainter*>* instances_;
 
   // Not owned
   views::Widget* frame_;
   views::View* window_icon_;  // May be NULL.
-  views::ImageButton* maximize_button_;
+  views::ImageButton* size_button_;
   views::ImageButton* close_button_;
   aura::Window* window_;
 
   // Window frame header/caption parts.
   const SkBitmap* button_separator_;
   const SkBitmap* top_left_corner_;
   const SkBitmap* top_edge_;
   const SkBitmap* top_right_corner_;
   const SkBitmap* header_left_edge_;
   const SkBitmap* header_right_edge_;
 
   // Bitmap and opacity last used for painting header.
   const SkBitmap* previous_theme_frame_;
   int previous_opacity_;
 
   // Bitmap and opacity we are crossfading from.
   const SkBitmap* crossfade_theme_frame_;
   int crossfade_opacity_;
 
   gfx::Rect header_frame_bounds_;
   scoped_ptr<ui::SlideAnimation> crossfade_animation_;
 
+  SizeButtonBehavior size_button_behavior_;
+
   DISALLOW_COPY_AND_ASSIGN(FramePainter);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_FRAME_PAINTER_H_