Converts DockedWindowLayoutManager to common ash/wm types

ash/root_window_controller.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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 15 matching lines @@
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/switchable_windows.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/touch/touch_hud_projection.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/always_on_top_controller.h"
+#include "ash/wm/aura/aura_layout_manager_adapter.h"
 #include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
 #include "ash/wm/dock/docked_window_layout_manager.h"
 #include "ash/wm/lock_layout_manager.h"
 #include "ash/wm/panels/attached_panel_window_targeter.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/panels/panel_window_event_handler.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/status_area_layout_manager.h"
@@ skipping 756 matching lines @@
     mouse_event_target_.reset(new aura::Window(new EmptyWindowDelegate));
     mouse_event_target_->Init(ui::LAYER_NOT_DRAWN);
 
     aura::Window* lock_background_container =
         GetContainer(kShellWindowId_LockScreenBackgroundContainer);
     lock_background_container->AddChild(mouse_event_target_.get());
     mouse_event_target_->Show();
   }
 
   // Create Docked windows layout manager
   aura::Window* docked_container = GetContainer(kShellWindowId_DockedContainer);

[varkha, 2016/04/21 17:46:55]

Would it make sense to have WmWindow* docked_container =
wm::WmWindowAura::Get(Getcontainer(id)) here and use that below?
Also could wm::WmWindowAura::Get() ever fail in otherwise non-fatal scenario?

[sky, 2016/04/21 18:03:04]

Done.
No. The only potentially bad scenario is if someone calls WmWindowAura::Get()
after the aura::Window properties have been cleared (meaning part way through
the destructor). Other code has this restriction too (such as WindowState), so
I'm hoping it won't come up in practice.

-  docked_layout_manager_ =
-      new DockedWindowLayoutManager(docked_container, workspace_controller());
-  docked_container->SetLayoutManager(docked_layout_manager_);
+  docked_layout_manager_ = new DockedWindowLayoutManager(
+      wm::WmWindowAura::Get(docked_container), workspace_controller());
+  wm::WmWindowAura::Get(docked_container)
+      ->SetLayoutManager(base::WrapUnique(docked_layout_manager_));
 
   // Installs SnapLayoutManager to containers who set the
   // |kSnapsChildrenToPhysicalPixelBoundary| property.
   wm::InstallSnapLayoutManagerToContainers(root_window);
 
   // Create Panel layout manager
   aura::Window* panel_container = GetContainer(kShellWindowId_PanelContainer);
   panel_layout_manager_ = new PanelLayoutManager(panel_container);
   panel_container->SetLayoutManager(panel_layout_manager_);
   panel_container_handler_.reset(new PanelWindowEventHandler);
@@ skipping 258 matching lines @@
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace ash