Add window states docked; and docked minimized. Add wm window event to set docked and undocked.

ash/wm/dock/docked_window_layout_manager.cc

 // Copyright (c) 2013 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/dock/docked_window_layout_manager.h"
 
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 558 matching lines @@
       bounds.right() > container_bounds.x()) {
     return DOCKED_ALIGNMENT_LEFT;
   } else if (bounds.x() < container_bounds.right() &&
              bounds.right() >= container_bounds.right()) {
     return DOCKED_ALIGNMENT_RIGHT;
   }
   return DOCKED_ALIGNMENT_NONE;
 }
 
 DockedAlignment DockedWindowLayoutManager::CalculateAlignment() const {
-  // Find a child that is not being dragged and is not a popup.
+  return CalculateAlignmentExcept(dragged_window_);
+}
+
+DockedAlignment DockedWindowLayoutManager::CalculateAlignmentExcept(
+    const aura::Window* window) const {
+  // Find a child that is not the window being queried and is not a popup.
   // If such exists the current alignment is returned - even if some of the
   // children are hidden or minimized (so they can be restored without losing
   // the docked state).
   for (size_t i = 0; i < dock_container_->children().size(); ++i) {
-    aura::Window* window(dock_container_->children()[i]);
-    if (window != dragged_window_ && !IsPopupOrTransient(window))
+    aura::Window* child(dock_container_->children()[i]);
+    if (window != child && !IsPopupOrTransient(child))
       return alignment_;
   }
-  // No docked windows remain other than possibly the window being dragged.
+  // No docked windows remain other than possibly the window being queried.
   // Return |NONE| to indicate that windows may get docked on either side.
   return DOCKED_ALIGNMENT_NONE;
 }
 
 bool DockedWindowLayoutManager::CanDockWindow(
     aura::Window* window,
     DockedAlignment desired_alignment) {
   // Don't allow interactive docking of windows with transient parents such as
   // modal browser dialogs. Prevent docking of panels attached to shelf during
   // the drag.
@@ skipping 14 matching lines @@
         window->delegate()->GetMinimumSize().width() > kMaxDockWidth))) {
     return false;
   }
   // If a window is tall and cannot be resized down to maximum height allowed
   // then it cannot be docked.
   const gfx::Rect work_area =
       Shell::GetScreen()->GetDisplayNearestWindow(dock_container_).work_area();
   if (GetWindowHeightCloseTo(window, work_area.height()) > work_area.height())
     return false;
   // Cannot dock on the other size from an existing dock.
-  const DockedAlignment alignment = CalculateAlignment();
+  const DockedAlignment alignment = CalculateAlignmentExcept(window);
   if (desired_alignment != DOCKED_ALIGNMENT_NONE &&
       alignment != DOCKED_ALIGNMENT_NONE &&
       alignment != desired_alignment) {
     return false;
   }
   // Do not allow docking on the same side as shelf.
+  return IsDockedAlignmentValid(desired_alignment);
+}
+
+bool DockedWindowLayoutManager::IsDockedAlignmentValid(
+    DockedAlignment alignment) const {
   ShelfAlignment shelf_alignment = SHELF_ALIGNMENT_BOTTOM;

[oshima, 2014/10/01 23:48:57]

nit:

could you please change to
shelf_alignment = shelf_ ? shelf_->slignment() : XXX_BOTTOM?

[dtapuska, 2014/10/02 21:05:28]

Done.

   if (shelf_)
     shelf_alignment = shelf_->alignment();
-  if ((desired_alignment == DOCKED_ALIGNMENT_LEFT &&
+  if ((alignment == DOCKED_ALIGNMENT_LEFT &&
        shelf_alignment == SHELF_ALIGNMENT_LEFT) ||
-      (desired_alignment == DOCKED_ALIGNMENT_RIGHT &&
+      (alignment == DOCKED_ALIGNMENT_RIGHT &&
        shelf_alignment == SHELF_ALIGNMENT_RIGHT)) {
     return false;
   }
   return true;
 }
 
+void DockedWindowLayoutManager::MaybeSetDesiredDockedAlignment(
+    DockedAlignment alignment) {
+  // If the requested alignment is |NONE| or there are no
+  // docked windows return early as we can't change whether there is a
+  // dock or not. If the requested alignment is the same as the current
+  // alignment return early as an optimization.
+  if (alignment == DOCKED_ALIGNMENT_NONE ||
+      alignment_ == DOCKED_ALIGNMENT_NONE ||
+      alignment_ == alignment ||
+      !IsDockedAlignmentValid(alignment)) {
+    return;
+  }
+  alignment_ = alignment;
+
+  Relayout();
+  UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED);
+}
+
 void DockedWindowLayoutManager::OnShelfBoundsChanged() {
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::DISPLAY_INSETS_CHANGED);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DockedWindowLayoutManager, aura::LayoutManager implementation:
 void DockedWindowLayoutManager::OnWindowResized() {
   MaybeMinimizeChildrenExcept(dragged_window_);
   Relayout();
@@ skipping 41 matching lines @@
   wm::GetWindowState(child)->RemoveObserver(this);
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED);
 }
 
 void DockedWindowLayoutManager::OnChildWindowVisibilityChanged(
     aura::Window* child,
     bool visible) {
   if (IsPopupOrTransient(child))
     return;
-  if (visible)
-    wm::GetWindowState(child)->Restore();
+
+  wm::WindowState* window_state = wm::GetWindowState(child);
+  if (visible && window_state->IsMinimized())

[oshima, 2014/10/01 23:48:57]

in which state (other than minimized) the window can be re-shown?

[dtapuska, 2014/10/02 21:05:28]

When restoring a app/panel (not a browser window); the window is restored first
by some other code; and if this code executes (ie; Restore()) it will undocks
the window; so you end up seeing that restoring panels doesn't work. So the
safeguard is that we only want to restore minimized windows here.

+    window_state->Restore();
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::CHILD_CHANGED);
 }
 
 void DockedWindowLayoutManager::SetChildBounds(
     aura::Window* child,
     const gfx::Rect& requested_bounds) {
   // The minimum constraints have to be applied first by the layout manager.
   gfx::Rect actual_new_bounds(requested_bounds);
   if (child->delegate()) {
@@ skipping 93 matching lines @@
 void DockedWindowLayoutManager::OnPreWindowStateTypeChange(
     wm::WindowState* window_state,
     wm::WindowStateType old_type) {
   aura::Window* window = window_state->window();
   if (IsPopupOrTransient(window))
     return;
   // The window property will still be set, but no actual change will occur
   // until OnFullscreenStateChange is called when exiting fullscreen.
   if (in_fullscreen_)
     return;
-  if (window_state->IsMinimized()) {
-    MinimizeDockedWindow(window_state);
-  } else if (window_state->IsMaximizedOrFullscreen() ||
-             window_state->IsSnapped()) {
+  if (!window_state->IsDocked()) {
     if (window != dragged_window_) {
       UndockWindow(window);
-      RecordUmaAction(DOCKED_ACTION_MAXIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);
+      if (window_state->IsMaximizedOrFullscreen())
+        RecordUmaAction(DOCKED_ACTION_MAXIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);

[varkha, 2014/10/01 20:33:14]

Should probably record some other action in UMA (probably DOCKED_ACTION_UNDOCK)
when it is just undock and not DOCKED_ACTION_MAXIMIZE. Note that docked->snapped
state transition was recorded in UMA before as DOCKED_ACTION_MAXIMIZE action.
I am not sure if this belongs in this CL or the one that adds accelerators - up
to you.

[dtapuska, 2014/10/03 15:45:17]

Done.

     }
-  } else if (old_type == wm::WINDOW_STATE_TYPE_MINIMIZED) {
+  } else if (window_state->IsMinimized()) {
+    MinimizeDockedWindow(window_state);
+  } else if (old_type == wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED) {
     RestoreDockedWindow(window_state);
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // DockedWindowLayoutManager, WindowObserver implementation:
 
 void DockedWindowLayoutManager::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
@@ skipping 102 matching lines @@
   DCHECK(!IsPopupOrTransient(window));
   // Always place restored window at the bottom shuffling the other windows up.
   // TODO(varkha): add a separate container for docked windows to keep track
   // of ordering.
   gfx::Display display = Shell::GetScreen()->GetDisplayNearestWindow(
       dock_container_);
   const gfx::Rect work_area = display.work_area();
 
   // Evict the window if it can no longer be docked because of its height.
   if (!CanDockWindow(window, DOCKED_ALIGNMENT_NONE)) {
-    UndockWindow(window);
+    window_state->Restore();
     RecordUmaAction(DOCKED_ACTION_EVICT, DOCKED_ACTION_SOURCE_UNKNOWN);
     return;
   }
   gfx::Rect bounds(window->bounds());
   bounds.set_y(work_area.bottom());
   window->SetBounds(bounds);
   window->Show();
   MaybeMinimizeChildrenExcept(window);
   RecordUmaAction(DOCKED_ACTION_RESTORE, DOCKED_ACTION_SOURCE_UNKNOWN);
 }
@@ skipping 360 matching lines @@
 
 void DockedWindowLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   // This bounds change will have caused a change to the Shelf which does not
   // propagate automatically to this class, so manually recalculate bounds.
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING);
 }
 
 }  // namespace ash