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

ash/wm/workspace/frame_maximize_button.h

Index: ash/wm/workspace/frame_maximize_button.h
===================================================================
--- ash/wm/workspace/frame_maximize_button.h	(revision 130125)
+++ ash/wm/workspace/frame_maximize_button.h	(working copy)
@@ -35,11 +35,6 @@
   virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
 
-  // Sets is_left_right_enabled_ and updates tooltip.
-  void SetIsLeftRightEnabled(bool e);
-
-  void set_is_maximize_enabled(bool e) { is_maximize_enabled_ = e; }
-
  protected:
   // ImageButton overrides:
   virtual SkBitmap GetImageToPaint() OVERRIDE;
@@ -66,9 +61,6 @@
   // Updates |snap_type_| based on a mouse drag.
   void UpdateSnap(const gfx::Point& location);
 
-  // Returns true if maximizing is allowed.
-  bool AllowMaximize() const;
-
   // Returns the type of snap based on the specified location.
   SnapType SnapTypeForLocation(const gfx::Point& location) const;
 
@@ -92,10 +84,6 @@
   // should show the snap locations.
   bool is_snap_enabled_;
 
-  // Selectively enable/disable button functionality.
-  bool is_left_right_enabled_;
-  bool is_maximize_enabled_;
-
   // Did the user drag far enough to trigger snapping?
   bool exceeded_drag_threshold_;