Converts DockedWindowLayoutManager to common ash/wm types

ash/wm/default_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/wm/default_state.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/window_animation_types.h"
 #include "ash/wm/common/window_parenting_utils.h"
@@ skipping 50 matching lines @@
     WmWindow* new_root = globals->GetRootWindowForDisplayId(display.id());
     if (new_root != window_state->window()->GetRootWindow()) {
       WmWindow* new_container = new_root->GetChildByShellWindowId(
           window_state->window()->GetParent()->GetShellWindowId());
       new_container->AddChild(window_state->window());
     }
   }
 }
 
 DockedWindowLayoutManager* GetDockedWindowLayoutManager(WmGlobals* globals) {
-  WmWindow* active_window = globals->GetActiveWindow();
-  if (!active_window)
-    return nullptr;
-
-  WmWindow* dock_container =
-      active_window->GetRootWindow()->GetChildByShellWindowId(
-          kShellWindowId_DockedContainer);
-  DockedWindowLayoutManager* dock_layout =
-      static_cast<DockedWindowLayoutManager*>(
-          WmWindowAura::GetAuraWindow(dock_container)->layout_manager());
-  return dock_layout;
+  return DockedWindowLayoutManager::Get(globals->GetActiveWindow());
 }
 
 class ScopedPreferredAlignmentResetter {
  public:
   ScopedPreferredAlignmentResetter(DockedAlignment dock_alignment,
                                    DockedWindowLayoutManager* dock_layout)
       : docked_window_layout_manager_(dock_layout) {
     docked_window_layout_manager_->set_preferred_alignment(dock_alignment);
   }
   ~ScopedPreferredAlignmentResetter() {
@@ skipping 44 matching lines @@
         window_state->GetStateType() != desired_snap_state &&
         window_state->window()->GetType() != ui::wm::WINDOW_TYPE_PANEL) {
       const wm::WMEvent event(desired_snap_state ==
                               wm::WINDOW_STATE_TYPE_LEFT_SNAPPED ?
                               wm::WM_EVENT_SNAP_LEFT : wm::WM_EVENT_SNAP_RIGHT);
       window_state->OnWMEvent(&event);
       return;
     }
 
     if (dock_layout &&
-        dock_layout->CanDockWindow(window_state->aura_window(),
+        dock_layout->CanDockWindow(window_state->window(),
                                    desired_dock_alignment)) {
       if (window_state->IsDocked()) {
         dock_layout->MaybeSetDesiredDockedAlignment(desired_dock_alignment);
         return;
       }
 
       ScopedDockedLayoutEventSourceResetter event_source_resetter(dock_layout);
       ScopedPreferredAlignmentResetter alignmentResetter(desired_dock_alignment,
                                                          dock_layout);
       const wm::WMEvent event(wm::WM_EVENT_DOCK);
@@ skipping 581 matching lines @@
     gfx::Rect center_in_parent = GetDisplayWorkAreaBoundsInParent(window);
     center_in_parent.ClampToCenteredSize(window->GetBounds().size());
     window_state->SetBoundsDirectAnimated(center_in_parent);
   }
   // Centering window is treated as if a user moved and resized the window.
   window_state->set_bounds_changed_by_user(true);
 }
 
 }  // namespace wm
 }  // namespace ash