Cancel partial screenshot UI when lock happens.

chrome/browser/chromeos/power/power_button_observer.cc

Index: chrome/browser/chromeos/power/power_button_observer.cc
diff --git a/chrome/browser/chromeos/power/power_button_observer.cc b/chrome/browser/chromeos/power/power_button_observer.cc
index b7c0707948da868b528db751200fb79b504fe96f..20017b6fbd4a9f52497ad925e4400a803b41f55b 100644
--- a/chrome/browser/chromeos/power/power_button_observer.cc
+++ b/chrome/browser/chromeos/power/power_button_observer.cc
@@ -5,6 +5,7 @@
 #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"
@@ -18,9 +19,8 @@
 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,
@@ -39,13 +39,18 @@ PowerButtonObserver::PowerButtonObserver() {
 
   // 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() {
@@ -58,17 +63,18 @@ void PowerButtonObserver::Observe(int type,
   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: