Remove docked windows entirely in M59.

ash/common/wm/window_resizer.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/common/wm/window_resizer.h"
 
-#include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ skipping 102 matching lines @@
   // repositioning the window when the minimize size is reached.
   gfx::Size size = GetSizeForDrag(&delta_x, &delta_y);
   gfx::Point origin = GetOriginForDrag(delta_x, delta_y);
   gfx::Rect new_bounds(origin, size);
 
   // Sizing has to keep the result on the screen. Note that this correction
   // has to come first since it might have an impact on the origin as well as
   // on the size.
   if (details().bounds_change & kBoundsChange_Resizes) {
     gfx::Rect work_area = GetTarget()->GetDisplayNearestWindow().work_area();
-    DockedWindowLayoutManager* dock_layout =
-        DockedWindowLayoutManager::Get(GetTarget());
-
-    work_area.Union(dock_layout->docked_bounds());
     work_area = GetTarget()->GetParent()->ConvertRectFromScreen(work_area);
     if (details().size_change_direction & kBoundsChangeDirection_Horizontal) {
       if (IsRightEdge(details().window_component) &&
           new_bounds.right() < work_area.x() + wm::kMinimumOnScreenArea) {
         int delta =
             work_area.x() + wm::kMinimumOnScreenArea - new_bounds.right();
         new_bounds.set_width(new_bounds.width() + delta);
       } else if (new_bounds.x() >
                  work_area.right() - wm::kMinimumOnScreenArea) {
         int width =
@@ skipping 42 matching lines @@
     // the |work_area| above isn't good for this check since it is the work area
     // for the current display but the window can move to a different one.
     WmWindow* parent = GetTarget()->GetParent();
     gfx::Point passed_location_in_screen(
         parent->ConvertPointToScreen(passed_location));
     gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size());
     // Use a pointer location (matching the logic in DragWindowResizer) to
     // calculate the target display after the drag.
     const display::Display& display =
         display::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
-    DockedWindowLayoutManager* dock_layout = DockedWindowLayoutManager::Get(
-        wm::GetRootWindowMatching(near_passed_location));
-
     gfx::Rect screen_work_area = display.work_area();
-    screen_work_area.Union(dock_layout->docked_bounds());
     screen_work_area.Inset(wm::kMinimumOnScreenArea, 0);
     gfx::Rect new_bounds_in_screen = parent->ConvertRectToScreen(new_bounds);
     if (!screen_work_area.Intersects(new_bounds_in_screen)) {
       // Make sure that the x origin does not leave the current display.
       new_bounds_in_screen.set_x(std::max(
           screen_work_area.x() - new_bounds.width(),
           std::min(screen_work_area.right(), new_bounds_in_screen.x())));
       new_bounds = parent->ConvertRectFromScreen(new_bounds_in_screen);
     }
   }
@@ skipping 109 matching lines @@
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier *
                  (details().initial_bounds_in_parent.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace ash