Aura desktop: Show resize cursors again.

ash/wm/power_button_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/wm/power_button_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/cursor_manager.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/aura/cursor_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/shared/compound_event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
@@ skipping 279 matching lines @@
 void PowerButtonController::OnLoginStateChanged(user::LoginStatus status) {
   login_status_ = status;
   unlocked_login_status_ = user::LOGGED_IN_NONE;
 }
 
 void PowerButtonController::OnAppTerminating() {
   // If we hear that Chrome is exiting but didn't request it ourselves, all we
   // can really hope for is that we'll have time to clear the screen.
   if (!shutting_down_) {
     shutting_down_ = true;
-    ash::Shell::GetInstance()->env_filter()->
-        set_update_cursor_visibility(false);
-    aura::Env::GetInstance()->cursor_manager()->ShowCursor(false);
+    Shell* shell = ash::Shell::GetInstance();
+    shell->env_filter()->set_update_cursor_visibility(false);
+    shell->cursor_manager()->ShowCursor(false);
     ShowBackgroundLayer();
     StartAnimation(ALL_CONTAINERS, ANIMATION_HIDE);
   }
 }
 
 void PowerButtonController::OnLockStateChanged(bool locked) {
   if (shutting_down_ || (login_status_ == user::LOGGED_IN_LOCKED) == locked)
     return;
 
   if (!locked && login_status_ == user::LOGGED_IN_LOCKED) {
@@ skipping 202 matching lines @@
   shutdown_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kShutdownTimeoutMs),
       this, &PowerButtonController::OnShutdownTimeout);
 }
 
 void PowerButtonController::StartShutdownAnimationAndRequestShutdown() {
   DCHECK(!shutting_down_);
   shutting_down_ = true;
 
-  ash::Shell::GetInstance()->env_filter()->set_update_cursor_visibility(false);
-  aura::Env::GetInstance()->cursor_manager()->ShowCursor(false);
+  Shell* shell = ash::Shell::GetInstance();
+  shell->env_filter()->set_update_cursor_visibility(false);
+  shell->cursor_manager()->ShowCursor(false);
 
   ShowBackgroundLayer();
   if (login_status_ != user::LOGGED_IN_NONE) {
     // Hide the other containers before starting the animation.
     // ANIMATION_FAST_CLOSE will make the screen locker windows partially
     // transparent, and we don't want the other windows to show through.
     StartAnimation(ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS,
                    ANIMATION_HIDE);
     StartAnimation(SCREEN_LOCKER_AND_RELATED_CONTAINERS, ANIMATION_FAST_CLOSE);
   } else {
@@ skipping 21 matching lines @@
     root_layer->StackAtBottom(background_layer_.get());
   }
   background_layer_->SetVisible(true);
 }
 
 void PowerButtonController::HideBackgroundLayer() {
   background_layer_.reset();
 }
 
 }  // namespace ash