cros/ash: Cancel screenshot mode if screenshot is cancelled or not taken.

ash/utility/screenshot_controller.cc

 // Copyright 2014 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/utility/screenshot_controller.h"
 
 #include <cmath>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/display/mouse_cursor_event_filter.h"
@@ skipping 290 matching lines @@
 void ScreenshotController::CancelScreenshotSession() {
   mode_ = NONE;
   pen_events_only_ = false;
   root_window_ = nullptr;
   SetSelectedWindow(nullptr);
   screenshot_delegate_ = nullptr;
   display::Screen::GetScreen()->RemoveObserver(this);
   base::STLDeleteValues(&layers_);
   cursor_setter_.reset();
   EnableMouseWarp(true);
+
+  if (on_screenshot_session_done_) {
+    // Copy the closure to a temporary value so that if it calls
+    // CancelScreenshotSession we do not loop forever.
+    base::Closure on_done = on_screenshot_session_done_;
+    on_screenshot_session_done_.Reset();
+    on_done.Run();
+  }
 }
 
 void ScreenshotController::MaybeStart(const ui::LocatedEvent& event) {
   aura::Window* current_root =
       static_cast<aura::Window*>(event.target())->GetRootWindow();
   if (root_window_) {
     // It's already started. This can happen when the second finger touches
     // the screen, or combination of the touch and mouse. We should grab the
     // partial screenshot instead of restarting.
     if (current_root == root_window_) {
@@ skipping 213 matching lines @@
 
 void ScreenshotController::OnDisplayMetricsChanged(
     const display::Display& display,
     uint32_t changed_metrics) {}
 
 void ScreenshotController::OnWindowDestroying(aura::Window* window) {
   SetSelectedWindow(nullptr);
 }
 
 }  // namespace ash