Cancel partial screenshot UI when lock happens.

ash/wm/power_button_controller.cc

Index: ash/wm/power_button_controller.cc
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index aadedaaaf560328581b7d29dda86497e7a311ce8..3c2ea727bb6dd6232dcbe25cb86c07cd0b706e2a 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -290,12 +290,12 @@ PowerButtonController::PowerButtonController()
 PowerButtonController::~PowerButtonController() {
 }
 
-void PowerButtonController::OnLoginStateChange(bool logged_in, bool is_guest) {
-  logged_in_ = logged_in;
-  is_guest_ = is_guest;
+void PowerButtonController::OnLoginStateChanged(Shell::LoginStatus status) {
+  logged_in_ = (status != Shell::NOT_LOGGED_IN);

[sky, 2012/04/18 16:03:31]

Can logged_in_ and is_guest_ be converted to LoginStatus too?

[Jun Mukai, 2012/04/19 06:19:25]

Done.

+  is_guest_ = (status == Shell::LOGGED_IN_AS_GUEST);
 }
 
-void PowerButtonController::OnExit() {
+void PowerButtonController::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.
   if (!shutting_down_) {
@@ -308,7 +308,7 @@ void PowerButtonController::OnExit() {
   }
 }
 
-void PowerButtonController::OnLockStateChange(bool locked) {
+void PowerButtonController::OnLockStateChanged(bool locked) {
   if (shutting_down_ || locked_ == locked)
     return;