Only support left/right maximizing at 50% width when the --ash-enable-alternate-caption-button

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/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 91 matching lines @@
   // Before the window gets destroyed, the maximizer dialog needs to be shut
   // down since it would otherwise call into a deleted object.
   maximizer_.reset();
   if (widget_)
     OnWindowDestroying(widget_->GetNativeWindow());
 }
 
 void FrameMaximizeButton::SnapButtonHovered(SnapType type) {
   // Make sure to only show hover operations when no button is pressed and
   // a similar snap operation in progress does not get re-applied.
-  if (is_snap_enabled_ || (type == snap_type_ && snap_sizer_))
+  if (is_snap_enabled_)
     return;
   // Prime the mouse location with the center of the (local) button.
   press_location_ = gfx::Point(width() / 2, height() / 2);
   // Then get an adjusted mouse position to initiate the effect.
   gfx::Point location = press_location_;
   switch (type) {
     case SNAP_LEFT:
       location.set_x(location.x() - width());
       break;
     case SNAP_RIGHT:
@@ skipping 11 matching lines @@
       break;
     case SNAP_MAXIMIZE:
       break;
     case SNAP_NONE:
       Cancel(true);
       return;
     default:
       // We should not come here.
       NOTREACHED();
   }
-  // Note: There is no hover with touch - we can therefore pass false for touch
-  // operations.
-  UpdateSnap(location, true, false);
+  UpdateSnap(location);
 }
 
 void FrameMaximizeButton::ExecuteSnapAndCloseMenu(SnapType snap_type) {
   // We can come here with no snap type set in case that the mouse opened the
   // maximize button and a touch event "touched" a button.
   if (snap_type_ == SNAP_NONE)
     SnapButtonHovered(snap_type);
 
   Cancel(true);
   // Tell our menu to close.
   maximizer_.reset();
   snap_type_ = snap_type;
-  // Since Snap might destroy |this|, but the snap_sizer needs to be destroyed,
-  // The ownership of the snap_sizer is taken now.
-  scoped_ptr<SnapSizer> snap_sizer(snap_sizer_.release());
-  Snap(*snap_sizer.get());
+  Snap();
 }
 
 void FrameMaximizeButton::DestroyMaximizeMenu() {
   Cancel(false);
 }
 
 void FrameMaximizeButton::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
@@ skipping 158 matching lines @@
   // Prepare the help menu.
   if (!maximizer_) {
     maximizer_.reset(new MaximizeBubbleController(
         this,
         GetMaximizeBubbleFrameState(),
         bubble_appearance_delay_ms_));
   } else {
     // If the menu did not show up yet, we delay it even a bit more.
     maximizer_->DelayCreation();
   }
-  snap_sizer_.reset(NULL);
   InstallEventFilter();
   snap_type_ = SNAP_NONE;
   press_location_ = event.location();
   press_is_gesture_ = event.IsGestureEvent();
   exceeded_drag_threshold_ = false;
   update_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kUpdateDelayMS),
       this,
       &FrameMaximizeButton::UpdateSnapFromEventLocation);
 }
 
 void FrameMaximizeButton::ProcessUpdateEvent(const ui::LocatedEvent& event) {
   DCHECK(is_snap_enabled_);
   if (!exceeded_drag_threshold_) {
     exceeded_drag_threshold_ = views::View::ExceededDragThreshold(
         event.location() - press_location_);
   }
   if (exceeded_drag_threshold_)
-    UpdateSnap(event.location(), false, event.IsGestureEvent());
+    UpdateSnap(event.location());
 }
 
 bool FrameMaximizeButton::ProcessEndEvent(const ui::LocatedEvent& event) {
   update_timer_.Stop();
   UninstallEventFilter();
   bool should_snap = is_snap_enabled_;
   is_snap_enabled_ = false;
 
   // Remove our help bubble.
   maximizer_.reset();
 
   if (!should_snap || snap_type_ == SNAP_NONE)
     return false;
 
   SetState(views::CustomButton::STATE_NORMAL);
   // SetState will not call SchedulePaint() if state was already set to
   // STATE_NORMAL during a drag.
   SchedulePaint();
   phantom_window_.reset();
-  // Since Snap might destroy |this|, but the snap_sizer needs to be destroyed,
-  // The ownership of the snap_sizer is taken now.
-  scoped_ptr<SnapSizer> snap_sizer(snap_sizer_.release());
-  Snap(*snap_sizer.get());
+  Snap();
   return true;
 }
 
 void FrameMaximizeButton::Cancel(bool keep_menu_open) {
   if (!keep_menu_open) {
     maximizer_.reset();
     UninstallEventFilter();
     is_snap_enabled_ = false;
-    snap_sizer_.reset();
   }
   phantom_window_.reset();
   snap_type_ = SNAP_NONE;
   update_timer_.Stop();
   SchedulePaint();
 }
 
 void FrameMaximizeButton::InstallEventFilter() {
   if (escape_event_filter_)
     return;
 
   escape_event_filter_.reset(new EscapeEventFilter(this));
 }
 
 void FrameMaximizeButton::UninstallEventFilter() {
   escape_event_filter_.reset(NULL);
 }
 
 void FrameMaximizeButton::UpdateSnapFromEventLocation() {
   // If the drag threshold has been exceeded the snap location is up to date.
   if (exceeded_drag_threshold_)
     return;
   exceeded_drag_threshold_ = true;
-  UpdateSnap(press_location_, false, press_is_gesture_);
+  UpdateSnap(press_location_);
 }
 
-void FrameMaximizeButton::UpdateSnap(const gfx::Point& location,
-                                     bool select_default,
-                                     bool is_touch) {
+void FrameMaximizeButton::UpdateSnap(const gfx::Point& location) {

[pkotwicz, 2013/08/30 21:10:57]

I removed the now unused extra parameters from UpdateSnap().

   SnapType type = SnapTypeForLocation(location);
-  if (type == snap_type_) {
-    if (snap_sizer_) {
-      snap_sizer_->Update(LocationForSnapSizer(location));
-      phantom_window_->Show(ScreenAsh::ConvertRectToScreen(
-          frame_->GetWidget()->GetNativeView()->parent(),
-          snap_sizer_->target_bounds()));
-    }
+  if (type == snap_type_)
     return;
-  }
 
   snap_type_ = type;
-  snap_sizer_.reset();
   SchedulePaint();
 
   if (snap_type_ == SNAP_NONE) {
     phantom_window_.reset();
     return;
   }
 
-  if (snap_type_ == SNAP_LEFT || snap_type_ == SNAP_RIGHT) {
-    SnapSizer::Edge snap_edge = snap_type_ == SNAP_LEFT ?
-        SnapSizer::LEFT_EDGE : SnapSizer::RIGHT_EDGE;
-    SnapSizer::InputType input_type =
-        is_touch ? SnapSizer::TOUCH_MAXIMIZE_BUTTON_INPUT :
-                   SnapSizer::OTHER_INPUT;
-    snap_sizer_.reset(new SnapSizer(frame_->GetWidget()->GetNativeWindow(),
-                                    LocationForSnapSizer(location),
-                                    snap_edge,
-                                    input_type));
-    if (select_default)
-      snap_sizer_->SelectDefaultSizeAndDisableResize();
-  }
   if (!phantom_window_) {
     phantom_window_.reset(new internal::PhantomWindowController(
                               frame_->GetWidget()->GetNativeWindow()));
   }
   if (maximizer_) {
     phantom_window_->set_phantom_below_window(maximizer_->GetBubbleWindow());
     maximizer_->SetSnapType(snap_type_);
   }
-  phantom_window_->Show(
-      ScreenBoundsForType(snap_type_, *snap_sizer_.get()));
+  phantom_window_->Show(ScreenBoundsForType(snap_type_));
 }
 
 SnapType FrameMaximizeButton::SnapTypeForLocation(
     const gfx::Point& location) const {
   MaximizeBubbleFrameState maximize_type = GetMaximizeBubbleFrameState();
   gfx::Vector2d delta(location - press_location_);
   if (!views::View::ExceededDragThreshold(delta))
     return maximize_type != FRAME_STATE_FULL ? SNAP_MAXIMIZE : SNAP_RESTORE;
   if (delta.x() < 0 && delta.y() > delta.x() && delta.y() < -delta.x())
     return maximize_type == FRAME_STATE_SNAP_LEFT ? SNAP_RESTORE : SNAP_LEFT;
   if (delta.x() > 0 && delta.y() > -delta.x() && delta.y() < delta.x())
     return maximize_type == FRAME_STATE_SNAP_RIGHT ? SNAP_RESTORE : SNAP_RIGHT;
   if (delta.y() > 0)
     return SNAP_MINIMIZE;
   return maximize_type != FRAME_STATE_FULL ? SNAP_MAXIMIZE : SNAP_RESTORE;
 }
 
-gfx::Rect FrameMaximizeButton::ScreenBoundsForType(
-    SnapType type,
-    const SnapSizer& snap_sizer) const {
+gfx::Rect FrameMaximizeButton::ScreenBoundsForType(SnapType type) const {
   aura::Window* window = frame_->GetWidget()->GetNativeWindow();
   switch (type) {
     case SNAP_LEFT:
-    case SNAP_RIGHT:
-      return ScreenAsh::ConvertRectToScreen(
-          frame_->GetWidget()->GetNativeView()->parent(),
-          snap_sizer.target_bounds());
+    case SNAP_RIGHT: {
+      SnapSizer snap_sizer(
+          window,
+          gfx::Point(),
+          (type == SNAP_LEFT) ? SnapSizer::LEFT_EDGE : SnapSizer::RIGHT_EDGE,
+          SnapSizer::STEP_NO);
+      return ScreenAsh::ConvertRectToScreen(window->parent(),
+                                            snap_sizer.target_bounds());
+    }
     case SNAP_MAXIMIZE:
       return ScreenAsh::ConvertRectToScreen(
           window->parent(),
           ScreenAsh::GetMaximizedWindowBoundsInParent(window));
     case SNAP_MINIMIZE: {
       gfx::Rect rect = GetMinimizeAnimationTargetBoundsInScreen(window);
       if (!rect.IsEmpty()) {
         // PhantomWindowController insets slightly, outset it so the phantom
         // doesn't appear inset.
         rect.Inset(-8, -8);
       }
       return rect;
     }
     case SNAP_RESTORE: {
       const gfx::Rect* restore = GetRestoreBoundsInScreen(window);
       return restore ?
           *restore : frame_->GetWidget()->GetWindowBoundsInScreen();
     }
     case SNAP_NONE:
       NOTREACHED();
   }
   return gfx::Rect();
 }
 
-gfx::Point FrameMaximizeButton::LocationForSnapSizer(
-    const gfx::Point& location) const {
-  gfx::Point result(location);
-  views::View::ConvertPointToScreen(this, &result);
-  return result;
-}
-
-void FrameMaximizeButton::Snap(const SnapSizer& snap_sizer) {
+void FrameMaximizeButton::Snap() {
   ash::Shell* shell = ash::Shell::GetInstance();
   views::Widget* widget = frame_->GetWidget();
   switch (snap_type_) {
     case SNAP_LEFT:
+      shell->delegate()->RecordUserMetricsAction(
+          ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_LEFT);
+      SnapSizer::SnapWindow(widget->GetNativeView(),
+                            SnapSizer::LEFT_EDGE,
+                            SnapSizer::STEP_NO);
+      break;
     case SNAP_RIGHT: {
       shell->delegate()->RecordUserMetricsAction(
-          snap_type_ == SNAP_LEFT ?
-              ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_LEFT :
-              ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_RIGHT);
-      // Get the bounds in screen coordinates for restore purposes.
-      gfx::Rect restore = widget->GetWindowBoundsInScreen();
-      if (widget->IsMaximized() || widget->IsFullscreen()) {
-        aura::Window* window = widget->GetNativeWindow();
-        // In case of maximized we have a restore boundary.
-        DCHECK(ash::GetRestoreBoundsInScreen(window));
-        // If it was maximized we need to recover the old restore set.
-        restore = *ash::GetRestoreBoundsInScreen(window);
-
-        // The auto position manager will kick in when this is the only window.
-        // To avoid interference with it we tell it temporarily to not change
-        // the coordinates of this window.
-        bool is_managed = ash::wm::IsWindowPositionManaged(window);
-        if (is_managed)
-          ash::wm::SetWindowPositionManaged(window, false);
-
-        // Set the restore size we want to restore to.
-        ash::SetRestoreBoundsInScreen(window,
-                                      ScreenBoundsForType(snap_type_,
-                                                          snap_sizer));
-        widget->Restore();
-
-        // After the window is where we want it to be we allow the window to be
-        // auto managed again.
-        if (is_managed)
-          ash::wm::SetWindowPositionManaged(window, true);
-      } else {
-        // Others might also have set up a restore rectangle already. If so,
-        // we should not overwrite the restore rectangle.
-        bool restore_set =
-            GetRestoreBoundsInScreen(widget->GetNativeWindow()) != NULL;
-        widget->SetBounds(ScreenBoundsForType(snap_type_, snap_sizer));
-        if (restore_set)
-          break;
-      }
-      // Remember the widow's bounds for restoration.
-      ash::SetRestoreBoundsInScreen(widget->GetNativeWindow(), restore);
+          ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_RIGHT);
+      SnapSizer::SnapWindow(widget->GetNativeView(),
+                            SnapSizer::RIGHT_EDGE,
+                            SnapSizer::STEP_NO);
       break;
     }
     case SNAP_MAXIMIZE:
       widget->Maximize();
       shell->delegate()->RecordUserMetricsAction(
           ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE);
       break;
     case SNAP_MINIMIZE:
       widget->Minimize();
       shell->delegate()->RecordUserMetricsAction(
@@ skipping 34 matching lines @@
     return FRAME_STATE_SNAP_LEFT;
   if (bounds.right() == screen.right())
     return FRAME_STATE_SNAP_RIGHT;
   // If we come here, it is likely caused by the fact that the
   // "VerticalResizeDoubleClick" stored a restore rectangle. In that case
   // we allow all maximize operations (and keep the restore rectangle).
   return FRAME_STATE_NONE;
 }
 
 }  // namespace ash