Cancel partial screenshot UI when lock happens.

chrome/browser/chromeos/power/power_button_observer.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 "chrome/browser/chromeos/power/power_button_observer.h"
 
 #include "ash/shell.h"
+#include "ash/system/user/login_status.h"
 #include "ash/wm/power_button_controller.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 PowerButtonObserver::PowerButtonObserver() {
-  ash::PowerButtonController* controller =
-      ash::Shell::GetInstance()->power_button_controller();
-  controller->set_delegate(new PowerButtonControllerDelegateChromeos);
+  ash::Shell::GetInstance()->power_button_controller()->
+      set_delegate(new PowerButtonControllerDelegateChromeos);
 
   registrar_.Add(
       this,
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::NotificationService::AllSources());
   registrar_.Add(
       this,
       content::NOTIFICATION_APP_TERMINATING,
       content::NotificationService::AllSources());
   registrar_.Add(
       this,
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::NotificationService::AllSources());
 
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 
   // Tell the controller about the initial state.
   const UserManager* user_manager = UserManager::Get();
-  bool logged_in = user_manager->IsUserLoggedIn();
-  bool is_guest = logged_in && user_manager->GetLoggedInUser().is_guest();
-  controller->OnLoginStateChange(logged_in, is_guest);
+  ash::user::LoginStatus login_status = ash::user::LOGGED_IN_NONE;
+  if (user_manager->IsUserLoggedIn()) {
+    if (user_manager->GetLoggedInUser().is_guest())
+      login_status = ash::user::LOGGED_IN_GUEST;
+    else
+      login_status = ash::user::LOGGED_IN_USER;
+  }
+  ash::Shell::GetInstance()->OnLoginStateChanged(login_status);
 
   const ScreenLocker* locker = ScreenLocker::default_screen_locker();
   bool locked = locker && locker->locked();
-  controller->OnLockStateChange(locked);
+  ash::Shell::GetInstance()->OnLockStateChanged(locked);
 }
 
 PowerButtonObserver::~PowerButtonObserver() {
   DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
 }
 
 void PowerButtonObserver::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_LOGIN_USER_CHANGED: {
       const User* user = &UserManager::Get()->GetLoggedInUser();
-      ash::Shell::GetInstance()->power_button_controller()->
-          OnLoginStateChange(true /* logged_in */, user->is_guest());
+      ash::user::LoginStatus login_status = user->is_guest() ?

[sky, 2012/04/19 15:43:29]

this is nearly identical to 43-48. Refactor into a common function. (it can be
in an anonmyous namespace in this file if you want, or if there is some more
central place put it there).

[Jun Mukai, 2012/04/20 07:27:33]

Done.

+          ash::user::LOGGED_IN_GUEST :
+          ash::user::LOGGED_IN_USER;
+      ash::Shell::GetInstance()->OnLoginStateChanged(login_status);
       break;
     }
     case content::NOTIFICATION_APP_TERMINATING:
-      ash::Shell::GetInstance()->power_button_controller()->OnExit();
+      ash::Shell::GetInstance()->OnAppTerminating();
       break;
     case chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED: {
       bool locked = *content::Details<bool>(details).ptr();
-      ash::Shell::GetInstance()->power_button_controller()->
-          OnLockStateChange(locked);
+      ash::Shell::GetInstance()->OnLockStateChanged(locked);
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 void PowerButtonObserver::PowerButtonStateChanged(
     bool down, const base::TimeTicks& timestamp) {
   ash::Shell::GetInstance()->power_button_controller()->
       OnPowerButtonEvent(down, timestamp);
 }
 
 void PowerButtonObserver::LockButtonStateChanged(
     bool down, const base::TimeTicks& timestamp) {
   ash::Shell::GetInstance()->power_button_controller()->
       OnLockButtonEvent(down, timestamp);
 }
 
 void PowerButtonObserver::LockScreen() {
   ash::Shell::GetInstance()->power_button_controller()->OnStartingLock();
 }
 
 }  // namespace chromeos