Makes WorkspaceLayoutManager use ash/wm/common types

ash/wm/workspace_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/wm/workspace_controller.h"
 
 #include <utility>
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
+#include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
@@ skipping 11 matching lines @@
 
 }  // namespace
 
 WorkspaceController::WorkspaceController(
     aura::Window* viewport,
     std::unique_ptr<wm::WorkspaceLayoutManagerDelegate> delegate)
     : viewport_(viewport),
       shelf_(NULL),
       event_handler_(new WorkspaceEventHandler),
       layout_manager_(
-          new WorkspaceLayoutManager(viewport, std::move(delegate))) {
+          new WorkspaceLayoutManager(wm::WmWindowAura::Get(viewport),
+                                     std::move(delegate))) {
   SetWindowVisibilityAnimationTransition(
       viewport_, ::wm::ANIMATE_NONE);
 
-  viewport_->SetLayoutManager(layout_manager_);
+  wm::WmWindowAura::Get(viewport_)->SetLayoutManager(
+      base::WrapUnique(layout_manager_));
   viewport_->AddPreTargetHandler(event_handler_.get());
 }
 
 WorkspaceController::~WorkspaceController() {
   viewport_->SetLayoutManager(NULL);
   viewport_->RemovePreTargetHandler(event_handler_.get());
 }
 
 wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
   if (!shelf_)
@@ skipping 69 matching lines @@
     viewport_->layer()->SetOpacity(1.0f);
   }
 }
 
 void WorkspaceController::SetMaximizeBackdropDelegate(
     std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) {
   layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate));
 }
 
 }  // namespace ash