Cancel partial screenshot UI when lock happens.

ash/wm/power_button_controller.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 "ash/wm/power_button_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/root_window_event_filter.h"
@@ skipping 272 matching lines @@
       lock_button_down_(false),
       shutting_down_(false),
       has_legacy_power_button_(
           CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kAuraLegacyPowerButton)) {
 }
 
 PowerButtonController::~PowerButtonController() {
 }
 
-void PowerButtonController::OnLoginStateChange(bool logged_in, bool is_guest) {
+void PowerButtonController::OnLoginStateChanged(bool logged_in, bool is_guest) {
   logged_in_ = logged_in;
   is_guest_ = is_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_) {
     shutting_down_ = true;
     ash::Shell::GetInstance()->root_filter()->
         set_update_cursor_visibility(false);
     Shell::GetRootWindow()->ShowCursor(false);
     ShowBackgroundLayer();
     StartAnimation(ALL_CONTAINERS, ANIMATION_HIDE);
   }
 }
 
-void PowerButtonController::OnLockStateChange(bool locked) {
+void PowerButtonController::OnLockStateChanged(bool locked) {
   if (shutting_down_ || locked_ == locked)
     return;
 
   locked_ = locked;
   if (locked) {
     StartAnimation(SCREEN_LOCKER_CONTAINERS, ANIMATION_FADE_IN);
     lock_timer_.Stop();
     lock_fail_timer_.Stop();
 
     if (!has_legacy_power_button_ && power_button_down_) {
@@ skipping 212 matching lines @@
     root_layer->StackAtBottom(background_layer_.get());
   }
   background_layer_->SetVisible(true);
 }
 
 void PowerButtonController::HideBackgroundLayer() {
   background_layer_.reset();
 }
 
 }  // namespace ash