Merge 173933

ash/wm/session_state_controller_impl2.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/session_state_controller_impl2.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 153 matching lines @@
 }
 
 void SessionStateControllerImpl2::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.
   // This is also the case when the user signs off.
   if (!shutting_down_) {
     shutting_down_ = true;
     Shell* shell = ash::Shell::GetInstance();
     shell->env_filter()->set_cursor_hidden_by_filter(false);
-    shell->cursor_manager()->ShowCursor(false);
+    shell->cursor_manager()->DisableMouseEvents();
     animator_->StartAnimation(
         internal::SessionStateAnimator::kAllContainersMask,
         internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
         internal::SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
   }
 }
 
 void SessionStateControllerImpl2::OnLockStateChanged(bool locked) {
   if (shutting_down_ || (system_is_locked_ == locked))
     return;
@@ skipping 87 matching lines @@
   if (!shutting_down_)
     RequestShutdownImpl();
 }
 
 void SessionStateControllerImpl2::RequestShutdownImpl() {
   DCHECK(!shutting_down_);
   shutting_down_ = true;
 
   Shell* shell = ash::Shell::GetInstance();
   shell->env_filter()->set_cursor_hidden_by_filter(false);
-  shell->cursor_manager()->ShowCursor(false);
+  shell->cursor_manager()->DisableMouseEvents();
 
   StartShutdownAnimationImpl();
 }
 
 void SessionStateControllerImpl2::OnRootWindowHostCloseRequested(
                                                 const aura::RootWindow*) {
   Shell::GetInstance()->delegate()->Exit();
 }
 
 void SessionStateControllerImpl2::OnLockFailTimeout() {
@@ skipping 38 matching lines @@
           GetDuration(internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN),
       this,
       &SessionStateControllerImpl2::OnPreShutdownAnimationTimeout);
 }
 
 void SessionStateControllerImpl2::OnPreShutdownAnimationTimeout() {
   shutting_down_ = true;
 
   Shell* shell = ash::Shell::GetInstance();
   shell->env_filter()->set_cursor_hidden_by_filter(false);
-  shell->cursor_manager()->ShowCursor(false);
+  shell->cursor_manager()->DisableMouseEvents();
 
   StartRealShutdownTimer(false);
 }
 
 void SessionStateControllerImpl2::StartRealShutdownTimer(
     bool with_animation_time) {
   base::TimeDelta duration =
       base::TimeDelta::FromMilliseconds(kShutdownRequestDelayMs);
   if (with_animation_time) {
     duration += animator_->GetDuration(
@@ skipping 257 matching lines @@
       unlocked_properties_->background_is_hidden) {
     animator_->StartAnimationWithObserver(
         internal::SessionStateAnimator::DESKTOP_BACKGROUND,
         internal::SessionStateAnimator::ANIMATION_FADE_OUT,
         speed,
         observer);
   }
 }
 
 }  // namespace ash