Aura desktop: Show resize cursors again.

ash/wm/default_window_resizer.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/default_window_resizer.h"
 
 #include "ash/shell.h"
+#include "ash/wm/cursor_manager.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/cursor_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 DefaultWindowResizer::~DefaultWindowResizer() {
-  aura::Env::GetInstance()->cursor_manager()->UnlockCursor();
+  ash::Shell::GetInstance()->cursor_manager()->UnlockCursor();
 }
 
 // static
 DefaultWindowResizer*
 DefaultWindowResizer::Create(aura::Window* window,
                              const gfx::Point& location,
                              int window_component) {
   Details details(window, location, window_component);
   return details.is_resizable ? new DefaultWindowResizer(details) : NULL;
 }
@@ skipping 35 matching lines @@
   if (!did_move_or_resize_)
     return;
 
   details_.window->SetBounds(details_.initial_bounds);
 }
 
 DefaultWindowResizer::DefaultWindowResizer(const Details& details)
     : details_(details),
       did_move_or_resize_(false) {
   DCHECK(details_.is_resizable);
-  aura::Env::GetInstance()->cursor_manager()->LockCursor();
+  ash::Shell::GetInstance()->cursor_manager()->LockCursor();
 }
 
 }  // namespace aura