Undocks window first before side-snapping bounds

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/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 547 matching lines @@
     wm::WindowShowType 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()) {
+  } 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);
     RecordUmaAction(DOCKED_ACTION_MAXIMIZE, DOCKED_ACTION_SOURCE_UNKNOWN);
   } else if (old_type == wm::SHOW_TYPE_MINIMIZED) {
     RestoreDockedWindow(window_state);
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // DockLayoutManager, WindowObserver implementation:
@@ skipping 482 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 internal
 }  // namespace ash