| Index: window_manager.cc
 | 
| diff --git a/window_manager.cc b/window_manager.cc
 | 
| index 676661d7fc4d0452c7b6053171ce3dfb7dad4e40..e13439393628a90c23bcc9fc9279151f2a0ba30b 100644
 | 
| --- a/window_manager.cc
 | 
| +++ b/window_manager.cc
 | 
| @@ -900,10 +900,10 @@ void WindowManager::DestroyLoginController() {
 | 
|            this, &WindowManager::DestroyLoginControllerInternal));
 | 
|  }
 | 
|  
 | 
| -bool WindowManager::IsShuttingDown() const {
 | 
| +bool WindowManager::IsSessionEnding() const {
 | 
|    if (!screen_locker_handler_.get())
 | 
|      return false;
 | 
| -  return screen_locker_handler_->shutting_down();
 | 
| +  return screen_locker_handler_->session_ending();
 | 
|  }
 | 
|  
 | 
|  bool WindowManager::GetManagerSelection(
 | 
| @@ -1647,14 +1647,15 @@ void WindowManager::HandleEnterNotify(const XEnterWindowEvent& e) {
 | 
|  }
 | 
|  
 | 
|  void WindowManager::HandleKeyPress(const XKeyEvent& e) {
 | 
| -  // We grab the keyboard while shutting down; ignore any events that we get.
 | 
| -  if (IsShuttingDown())
 | 
| +  // We grab the keyboard while shutting down or signing out; ignore any events
 | 
| +  // that we get.
 | 
| +  if (IsSessionEnding())
 | 
|      return;
 | 
|    key_bindings_->HandleKeyPress(e.keycode, e.state, e.time);
 | 
|  }
 | 
|  
 | 
|  void WindowManager::HandleKeyRelease(const XKeyEvent& e) {
 | 
| -  if (IsShuttingDown())
 | 
| +  if (IsSessionEnding())
 | 
|      return;
 | 
|    key_bindings_->HandleKeyRelease(e.keycode, e.state, e.time);
 | 
|  }
 | 
| 
 |