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

ash/wm/workspace/frame_maximize_button.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/workspace/frame_maximize_button.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/launcher/launcher.h"
@@ skipping 78 matching lines @@
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 // FrameMaximizeButton ---------------------------------------------------------
 
 FrameMaximizeButton::FrameMaximizeButton(views::ButtonListener* listener,
                                          views::NonClientFrameView* frame)
     : ImageButton(listener),
       frame_(frame),
       is_snap_enabled_(false),
-      is_left_right_enabled_(true),
-      is_maximize_enabled_(true),
       exceeded_drag_threshold_(false),
       snap_type_(SNAP_NONE) {
   // TODO(sky): nuke this. It's temporary while we don't have good images.
   SetImageAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
   SetTooltipText(l10n_util::GetStringUTF16(IDS_FRAME_MAXIMIZE_BUTTON_TOOLTIP));
 }
 
 FrameMaximizeButton::~FrameMaximizeButton() {
 }
 
@@ skipping 46 matching lines @@
   } else {
     ImageButton::OnMouseReleased(event);
   }
 }
 
 void FrameMaximizeButton::OnMouseCaptureLost() {
   Cancel();
   ImageButton::OnMouseCaptureLost();
 }
 
-void FrameMaximizeButton::SetIsLeftRightEnabled(bool e) {
-  is_left_right_enabled_ = e;
-  int id = is_left_right_enabled_ ?
-      IDS_FRAME_MAXIMIZE_BUTTON_TOOLTIP :
-      IDS_FRAME_MAXIMIZE_BUTTON_NO_SIDE_SNAP_TOOLTIP;
-  SetTooltipText(l10n_util::GetStringUTF16(id));
-}
-
 SkBitmap FrameMaximizeButton::GetImageToPaint() {
   if (is_snap_enabled_) {
     int id = 0;
     if (frame_->GetWidget()->IsMaximized()) {
       switch (snap_type_) {
         case SNAP_LEFT:
           id = IDR_AURA_WINDOW_MAXIMIZED_RESTORE_SNAP_LEFT_P;
           break;
         case SNAP_RIGHT:
           id = IDR_AURA_WINDOW_MAXIMIZED_RESTORE_SNAP_RIGHT_P;
@@ skipping 81 matching lines @@
                                     LocationForSnapSizer(location),
                                     snap_edge, grid_size));
   }
   if (!phantom_window_.get()) {
     phantom_window_.reset(new internal::PhantomWindowController(
                               frame_->GetWidget()->GetNativeWindow()));
   }
   phantom_window_->Show(BoundsForType(snap_type_));
 }
 
-bool FrameMaximizeButton::AllowMaximize() const {
-  return !frame_->GetWidget()->IsMaximized() && is_maximize_enabled_;
-}
-
 FrameMaximizeButton::SnapType FrameMaximizeButton::SnapTypeForLocation(
     const gfx::Point& location) const {
   int delta_x = location.x() - press_location_.x();
   int delta_y = location.y() - press_location_.y();
   if (!views::View::ExceededDragThreshold(delta_x, delta_y))
-    return AllowMaximize() ? SNAP_MAXIMIZE : SNAP_NONE;
+    return !frame_->GetWidget()->IsMaximized() ? SNAP_MAXIMIZE : SNAP_RESTORE;
   else if (delta_x < 0 && delta_y > delta_x && delta_y < -delta_x)
-    return is_left_right_enabled_ ? SNAP_LEFT : SNAP_NONE;
+    return SNAP_LEFT;
   else if (delta_x > 0 && delta_y > -delta_x && delta_y < delta_x)
-    return is_left_right_enabled_ ? SNAP_RIGHT : SNAP_NONE;
+    return SNAP_RIGHT;
   else if (delta_y > 0)
     return SNAP_MINIMIZE;
-  else if (AllowMaximize())
-    return SNAP_MAXIMIZE;
-  return SNAP_NONE;
+  return !frame_->GetWidget()->IsMaximized() ? SNAP_MAXIMIZE : SNAP_RESTORE;
 }
 
 gfx::Rect FrameMaximizeButton::BoundsForType(SnapType type) const {
   aura::Window* window = frame_->GetWidget()->GetNativeWindow();
   switch (type) {
     case SNAP_LEFT:
     case SNAP_RIGHT:
       return snap_sizer_->target_bounds();
     case SNAP_MAXIMIZE:
       return ScreenAsh::GetMaximizedWindowBounds(window);
@@ skipping 38 matching lines @@
       break;
     case SNAP_MINIMIZE:
       frame_->GetWidget()->Minimize();
       break;
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace ash