Remove docked windows entirely in M59.

ash/common/wm/maximize_mode/maximize_mode_window_state.cc

 // Copyright 2014 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/common/wm/maximize_mode/maximize_mode_window_state.h"
 
 #include <utility>
 
 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/common/wm/window_animation_types.h"
@@ skipping 55 matching lines @@
   return GetCenteredBounds(bounds_in_parent, state_object);
 }
 
 gfx::Rect GetRestoreBounds(wm::WindowState* window_state) {
   if (window_state->IsMinimized() || window_state->IsMaximized() ||
       window_state->IsFullscreen()) {
     gfx::Rect restore_bounds = window_state->GetRestoreBoundsInScreen();
     if (!restore_bounds.IsEmpty())
       return restore_bounds;
   }
-  gfx::Rect bounds = window_state->window()->GetBoundsInScreen();
-  if (window_state->IsDocked()) {
-    gfx::Rect restore_bounds = window_state->GetRestoreBoundsInScreen();
-    // Use current window horizontal offset origin in order to preserve docked
-    // alignment but preserve restored size and vertical offset for the time
-    // when the window gets undocked.
-    if (!restore_bounds.IsEmpty()) {
-      bounds.set_size(restore_bounds.size());
-      bounds.set_y(restore_bounds.y());
-    }
-  }
-  return bounds;
+  return window_state->window()->GetBoundsInScreen();
 }
 
 }  // namespace
 
 // static
 void MaximizeModeWindowState::UpdateWindowPosition(
     wm::WindowState* window_state) {
   gfx::Rect bounds_in_parent = GetBoundsInMaximizedMode(window_state);
   if (bounds_in_parent == window_state->window()->GetBounds())
     return;
@@ skipping 45 matching lines @@
         UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_PINNED, true);
       break;
     case wm::WM_EVENT_TRUSTED_PIN:
       if (!WmShell::Get()->IsPinned())
         UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_TRUSTED_PINNED, true);
       break;
     case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION:
     case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE:
     case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE:
     case wm::WM_EVENT_TOGGLE_MAXIMIZE:
-    case wm::WM_EVENT_CYCLE_SNAP_DOCK_LEFT:
-    case wm::WM_EVENT_CYCLE_SNAP_DOCK_RIGHT:
+    case wm::WM_EVENT_CYCLE_SNAP_LEFT:
+    case wm::WM_EVENT_CYCLE_SNAP_RIGHT:
     case wm::WM_EVENT_CENTER:
     case wm::WM_EVENT_SNAP_LEFT:
     case wm::WM_EVENT_SNAP_RIGHT:
     case wm::WM_EVENT_NORMAL:
     case wm::WM_EVENT_MAXIMIZE:
-    case wm::WM_EVENT_DOCK:
       UpdateWindow(window_state, GetMaximizedOrCenteredWindowType(window_state),
                    true);
       return;
     case wm::WM_EVENT_MINIMIZE:
       UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_MINIMIZED, true);
       return;
     case wm::WM_EVENT_SHOW_INACTIVE:
       return;
     case wm::WM_EVENT_SET_BOUNDS:
       if (window_state->allow_set_bounds_in_maximized()) {
@@ skipping 157 matching lines @@
       // avoid flashing.
       if (window_state->IsMaximized())
         window_state->SetBoundsDirectCrossFade(bounds_in_parent);
       else
         window_state->SetBoundsDirectAnimated(bounds_in_parent);
     }
   }
 }
 
 }  // namespace ash