Undocks window first before side-snapping bounds

ash/wm/dock/docked_window_layout_manager.cc

Index: ash/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
index ee1d4386b8e7279fb791b55734fa3339cb05041f..cb07fe409636c28992db581edef5a275a8fc3917 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -565,7 +565,9 @@ void DockedWindowLayoutManager::OnWindowShowTypeChanged(
     return;
   if (window_state->IsMinimized()) {
     MinimizeDockedWindow(window_state);
-  } else if (window_state->IsMaximizedOrFullscreen()) {
+  } else if (window_state->IsMaximizedOrFullscreen() ||

[pkotwicz, 2013/11/18 16:25:20]

How about:
} else if (window_state->IsNormalShowState()) {
  if (old_type == wm::SHOW_TYPE_MINIMIZED)
    RestoreDockedWindow(window_state);
} else {
  UndockWindow(window);
  RecordUmaAction(DOCKED_ACTION_MAXIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);
}

[oshima, 2013/11/18 18:44:44]

sgtm

[varkha, 2013/11/20 00:11:13]

SHOW_TYPE_*_SNAPPED types are both present with IsNormalShowState so with
suggested code I would do nothing instead of undocking. I could do this:
} else if (window_state->IsNormalShowState() &&
           old_type == wm::SHOW_TYPE_MINIMIZED) {
    RestoreDockedWindow(window_state);
} else {
  UndockWindow(window);
  RecordUmaAction(DOCKED_ACTION_MAXIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);
}
... but I think this would be too general for undocking in all present and
future cases other than (Normal+from minimized). I would prefer having an
explicit code path for undocking when a window gets maximized.

+      window_state->window_show_type() == wm::SHOW_TYPE_LEFT_SNAPPED ||
+      window_state->window_show_type() == wm::SHOW_TYPE_RIGHT_SNAPPED) {
     // Reparenting changes the source bounds for the animation if a window is

[pkotwicz, 2013/11/18 16:25:20]

This comment is no longer relevant?

[varkha, 2013/11/20 00:11:13]

Done.

     // visible so hide it here and show later when it is already in the desktop.
     UndockWindow(window);