Stick windows to sides of workspaces

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/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/wm/maximize_bubble_controller.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/phantom_window_controller.h"
 #include "ash/wm/workspace/snap_sizer.h"
+#include "ash/wm/workspace/workspace_window_resizer.h"
+#include "base/command_line.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
@@ skipping 495 matching lines @@
   views::Widget* widget = frame_->GetWidget();
   switch (snap_type_) {
     case SNAP_LEFT:
     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();
+      bool restore_set = false;
+      gfx::Rect bounds;
+      aura::Window* window = widget->GetNativeWindow();
       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));
+        bounds = ScreenBoundsForType(snap_type_, snap_sizer);
+        ash::SetRestoreBoundsInScreen(window, bounds);
         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 =
+        restore_set =
             GetRestoreBoundsInScreen(widget->GetNativeWindow()) != NULL;
-        widget->SetBounds(ScreenBoundsForType(snap_type_, snap_sizer));
-        if (restore_set)
-          break;
+        bounds = ScreenBoundsForType(snap_type_, snap_sizer);
+        widget->SetBounds(bounds);
       }
+      gfx::Rect bounds_in_parent = ScreenAsh::ConvertRectToScreen(
+          window->parent(),
+          ScreenAsh::GetMaximizedWindowBoundsInParent(window));
+      int stuck_edges_mask =
+          internal::WorkspaceWindowResizer::CalculateStuckEdges(
+              bounds, bounds_in_parent);
+      if (GetStuckToEdge(window) != stuck_edges_mask &&
+          CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kAshEnableDockedWindows))

[flackr, 2013/05/22 02:00:56]

nit: multiline if condition should use braces.

+        SetStuckToEdge(window, stuck_edges_mask);

[flackr, 2013/05/22 02:00:56]

Why check if the condition is not stuck_edges_mask only to set it to
stuck_edges_mask? I'd suggest just having a function which updates the stuck
edge(s) of a window.

+
+      if (restore_set)
+        break;
+
       // Remember the widow's bounds for restoration.

[flackr, 2013/05/22 02:00:56]

s/widow/window

       ash::SetRestoreBoundsInScreen(widget->GetNativeWindow(), restore);
       break;
     }
     case SNAP_MAXIMIZE:
       widget->Maximize();
       shell->delegate()->RecordUserMetricsAction(
           ash::UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE);
       break;
     case SNAP_MINIMIZE:
       widget->Minimize();
@@ 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