| Index: ash/wm/workspace/workspace_window_resizer.cc
|
| ===================================================================
|
| --- ash/wm/workspace/workspace_window_resizer.cc (revision 173169)
|
| +++ ash/wm/workspace/workspace_window_resizer.cc (working copy)
|
| @@ -32,22 +32,23 @@
|
|
|
| namespace ash {
|
|
|
| -scoped_ptr<WindowResizer> CreateWindowResizer(aura::Window* window,
|
| - const gfx::Point& point_in_parent,
|
| - int window_component) {
|
| +scoped_ptr<views::corewm::WindowResizer> CreateWindowResizer(
|
| + aura::Window* window,
|
| + const gfx::Point& point_in_parent,
|
| + int window_component) {
|
| DCHECK(window);
|
| // No need to return a resizer when the window cannot get resized.
|
| if (!wm::CanResizeWindow(window) && window_component != HTCAPTION)
|
| - return scoped_ptr<WindowResizer>();
|
| + return scoped_ptr<views::corewm::WindowResizer>();
|
|
|
| - WindowResizer* window_resizer = NULL;
|
| + views::corewm::WindowResizer* window_resizer = NULL;
|
| if (window->parent() &&
|
| window->parent()->id() == internal::kShellWindowId_WorkspaceContainer) {
|
| // Allow dragging maximized windows if it's not tracked by workspace. This
|
| // is set by tab dragging code.
|
| if (!wm::IsWindowNormal(window) &&
|
| (window_component != HTCAPTION || GetTrackedByWorkspace(window)))
|
| - return scoped_ptr<WindowResizer>();
|
| + return scoped_ptr<views::corewm::WindowResizer>();
|
| window_resizer = internal::WorkspaceWindowResizer::Create(
|
| window,
|
| point_in_parent,
|
| @@ -61,7 +62,7 @@
|
| window_resizer = internal::DragWindowResizer::Create(
|
| window_resizer, window, point_in_parent, window_component);
|
| }
|
| - return make_scoped_ptr<WindowResizer>(window_resizer);
|
| + return make_scoped_ptr<views::corewm::WindowResizer>(window_resizer);
|
| }
|
|
|
| namespace internal {
|
|
|