Stick windows to sides of workspaces

ash/wm/base_layout_manager.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/base_layout_manager.h"
 
+#include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
+#include "ash/wm/workspace/stuck_edge_types.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
+#include "base/command_line.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/corewm/window_util.h"
 
@@ skipping 159 matching lines @@
   } else if ((window->TargetVisibility() ||
               last_show_state == ui::SHOW_STATE_MINIMIZED) &&
              !window->layer()->visible()) {
     // The layer may be hidden if the window was previously minimized. Make
     // sure it's visible.
     window->Show();
   }
 }
 
 void BaseLayoutManager::UpdateBoundsFromShowState(aura::Window* window) {
+  int stuck_edges_mask = GetStuckToEdge(window);
   switch (window->GetProperty(aura::client::kShowStateKey)) {
     case ui::SHOW_STATE_DEFAULT:
     case ui::SHOW_STATE_NORMAL: {
       const gfx::Rect* restore = GetRestoreBoundsInScreen(window);
       if (restore) {
         gfx::Rect bounds_in_parent =
             ScreenAsh::ConvertRectFromScreen(window->parent(), *restore);
         SetChildBoundsDirect(window,
                              BoundsWithScreenEdgeVisible(window,
                                                          bounds_in_parent));
+
+        // getting unstuck
+        stuck_edges_mask = STUCK_EDGE_NONE;
       }
       ClearRestoreBounds(window);
       break;
     }
 
     case ui::SHOW_STATE_MAXIMIZED:
       SetChildBoundsDirect(window,
                            ScreenAsh::GetMaximizedWindowBoundsInParent(window));
+      stuck_edges_mask = STUCK_EDGE_NONE;
       break;
 
     case ui::SHOW_STATE_FULLSCREEN:
       // Don't animate the full-screen window transition.
       // TODO(jamescook): Use animation here.  Be sure the lock screen works.
       SetChildBoundsDirect(
           window, ScreenAsh::GetDisplayBoundsInParent(window));
+      stuck_edges_mask = STUCK_EDGE_NONE;
       break;
 
     default:
       break;
   }
+  if (GetStuckToEdge(window) != stuck_edges_mask &&
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAshEnableDockedWindows))
+    SetStuckToEdge(window, stuck_edges_mask);
 }
 
 void BaseLayoutManager::AdjustWindowSizesForScreenChange() {
   // If a user plugs an external display into a laptop running Aura the
   // display size will change.  Maximized windows need to resize to match.
   // We also do this when developers running Aura on a desktop manually resize
   // the host window.
   // We also need to do this when the work area insets changes.
   for (WindowSet::const_iterator it = windows_.begin();
        it != windows_.end();
@@ skipping 12 matching lines @@
       // Put as much of the window as possible within the display area.
       gfx::Rect bounds = window->bounds();
       bounds.AdjustToFit(display_rect);
       window->SetBounds(bounds);
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash