Aura desktop: Show resize cursors again.

ash/tooltips/tooltip_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/tooltips/tooltip_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
+#include "ash/wm/cursor_manager.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/string_split.h"
 #include "base/time.h"
 #include "ui/aura/client/drag_drop_client.h"
-#include "ui/aura/cursor_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
@@ skipping 342 matching lines @@
   }
   *text = result;
 }
 
 void TooltipController::TooltipTimerFired() {
   UpdateIfRequired();
 }
 
 void TooltipController::UpdateIfRequired() {
   if (!tooltips_enabled_ || mouse_pressed_ || IsDragDropInProgress() ||
-      !aura::Env::GetInstance()->cursor_manager()->cursor_visible()) {
+      !ash::Shell::GetInstance()->cursor_manager()->cursor_visible()) {
     tooltip_->Hide();
     return;
   }
 
   string16 tooltip_text;
   if (tooltip_window_)
     tooltip_text = aura::client::GetTooltipText(tooltip_window_);
 
   // If the user pressed a mouse button. We will hide the tooltip and not show
   // it until there is a change in the tooltip.
@@ skipping 29 matching lines @@
 bool TooltipController::IsTooltipVisible() {
   return tooltip_->IsVisible();
 }
 
 bool TooltipController::IsDragDropInProgress() {
   return drag_drop_client_->IsDragDropInProgress();
 }
 
 }  // namespace internal
 }  // namespace ash