| Index: ash/aura/aura_layout_manager_adapter.cc
 | 
| diff --git a/ash/aura/aura_layout_manager_adapter.cc b/ash/aura/aura_layout_manager_adapter.cc
 | 
| index f1c95372359289054b26273083f8cdb04e751668..6f8a0eb0389779af885222764fb75640a8a59636 100644
 | 
| --- a/ash/aura/aura_layout_manager_adapter.cc
 | 
| +++ b/ash/aura/aura_layout_manager_adapter.cc
 | 
| @@ -4,8 +4,8 @@
 | 
|  
 | 
|  #include "ash/aura/aura_layout_manager_adapter.h"
 | 
|  
 | 
| -#include "ash/aura/wm_window_aura.h"
 | 
|  #include "ash/common/wm_layout_manager.h"
 | 
| +#include "ash/common/wm_window.h"
 | 
|  #include "ui/aura/window_property.h"
 | 
|  
 | 
|  DECLARE_WINDOW_PROPERTY_TYPE(ash::AuraLayoutManagerAdapter*);
 | 
| @@ -44,30 +44,29 @@ void AuraLayoutManagerAdapter::OnWindowResized() {
 | 
|  }
 | 
|  
 | 
|  void AuraLayoutManagerAdapter::OnWindowAddedToLayout(aura::Window* child) {
 | 
| -  wm_layout_manager_->OnWindowAddedToLayout(WmWindowAura::Get(child));
 | 
| +  wm_layout_manager_->OnWindowAddedToLayout(WmWindow::Get(child));
 | 
|  }
 | 
|  
 | 
|  void AuraLayoutManagerAdapter::OnWillRemoveWindowFromLayout(
 | 
|      aura::Window* child) {
 | 
| -  wm_layout_manager_->OnWillRemoveWindowFromLayout(WmWindowAura::Get(child));
 | 
| +  wm_layout_manager_->OnWillRemoveWindowFromLayout(WmWindow::Get(child));
 | 
|  }
 | 
|  
 | 
|  void AuraLayoutManagerAdapter::OnWindowRemovedFromLayout(aura::Window* child) {
 | 
| -  wm_layout_manager_->OnWindowRemovedFromLayout(WmWindowAura::Get(child));
 | 
| +  wm_layout_manager_->OnWindowRemovedFromLayout(WmWindow::Get(child));
 | 
|  }
 | 
|  
 | 
|  void AuraLayoutManagerAdapter::OnChildWindowVisibilityChanged(
 | 
|      aura::Window* child,
 | 
|      bool visible) {
 | 
| -  wm_layout_manager_->OnChildWindowVisibilityChanged(WmWindowAura::Get(child),
 | 
| +  wm_layout_manager_->OnChildWindowVisibilityChanged(WmWindow::Get(child),
 | 
|                                                       visible);
 | 
|  }
 | 
|  
 | 
|  void AuraLayoutManagerAdapter::SetChildBounds(
 | 
|      aura::Window* child,
 | 
|      const gfx::Rect& requested_bounds) {
 | 
| -  wm_layout_manager_->SetChildBounds(WmWindowAura::Get(child),
 | 
| -                                     requested_bounds);
 | 
| +  wm_layout_manager_->SetChildBounds(WmWindow::Get(child), requested_bounds);
 | 
|  }
 | 
|  
 | 
|  }  // namespace ash
 | 
| 
 |