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..701db2f3a0e63b46fde477a497d13019947667cb 100644
--- a/chrome/browser/chromeos/power/power_button_observer.cc
+++ b/chrome/browser/chromeos/power/power_button_observer.cc
@@ -18,9 +18,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 +38,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::Shell::LoginStatus login_status = ash::Shell::NOT_LOGGED_IN;
+  if (user_manager->IsUserLoggedIn()) {
+    if (user_manager->GetLoggedInUser().is_guest())
+      login_status = ash::Shell::LOGGED_IN_AS_GUEST;
+    else
+      login_status = ash::Shell::LOGGED_IN;
+  }
+  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 +62,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::Shell::LoginStatus login_status = user->is_guest() ?
+          ash::Shell::LOGGED_IN_AS_GUEST :
+          ash::Shell::LOGGED_IN;
+      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: