diff options
Diffstat (limited to 'ash/wm/window_resizer.cc')
| -rw-r--r-- | ash/wm/window_resizer.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index 14c1fd9..08ff0c4 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc @@ -142,10 +142,9 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(GetTarget()).work_area(); aura::Window* dock_container = Shell::GetContainer( - GetTarget()->GetRootWindow(), - internal::kShellWindowId_DockedContainer); - internal::DockedWindowLayoutManager* dock_layout = - static_cast<internal::DockedWindowLayoutManager*>( + GetTarget()->GetRootWindow(), kShellWindowId_DockedContainer); + DockedWindowLayoutManager* dock_layout = + static_cast<DockedWindowLayoutManager*>( dock_container->layout_manager()); work_area.Union(dock_layout->docked_bounds()); @@ -211,11 +210,11 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( // calculate the target display after the drag. const gfx::Display& display = Shell::GetScreen()->GetDisplayMatching(near_passed_location); - aura::Window* dock_container = Shell::GetContainer( - wm::GetRootWindowMatching(near_passed_location), - internal::kShellWindowId_DockedContainer); - internal::DockedWindowLayoutManager* dock_layout = - static_cast<internal::DockedWindowLayoutManager*>( + aura::Window* dock_container = + Shell::GetContainer(wm::GetRootWindowMatching(near_passed_location), + kShellWindowId_DockedContainer); + DockedWindowLayoutManager* dock_layout = + static_cast<DockedWindowLayoutManager*>( dock_container->layout_manager()); gfx::Rect screen_work_area = display.work_area(); |