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

ash/utility/screenshot_controller.h

 // 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.
 
 #ifndef ASH_UTILITY_SCREENSHOT_CONTROLLER_H_
 #define ASH_UTILITY_SCREENSHOT_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shell_observer.h"
+#include "base/callback.h"
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display_observer.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace aura {
 class Window;
 }
 
@@ skipping 25 matching lines @@
   // screenshot.
   void StartPartialScreenshotSession(ScreenshotDelegate* screenshot_delegate,
                                      bool draw_overlay_immediately);
 
   // Starts the UI for taking a window screenshot;
   void StartWindowScreenshotSession(ScreenshotDelegate* screenshot_delegate);
 
   // Cancels any active screenshot session.
   void CancelScreenshotSession();
 
+  // Set a function that will be called when the current screenshot session has
+  // been completed. This is reset after the screenshot session is done.

[oshima, 2016/09/16 20:42:25]

Can you update the comment and mention that this is called even if it's
cancelled? (completed sounds it's taken)

[jdufault, 2016/09/16 22:58:05]

Done.

+  void set_on_screenshot_session_done(const base::Closure& on_done) {
+    on_screenshot_session_done_ = on_done;
+  }
+
   // If set to true, then only events generated by a pen can be used to select
   // the area to take a screenshot of. This is reset to false after a screenshot
   // operation is completed.
   void set_pen_events_only(bool pen_events_only) {
     pen_events_only_ = pen_events_only;
   }
   bool pen_events_only() const { return pen_events_only_; }
 
  private:
   enum Mode {
@@ skipping 31 matching lines @@
 
   // aura::WindowObserver:
   void OnWindowDestroying(aura::Window* window) override;
 
   Mode mode_;
 
   // If true, then only pointer events will be used when selecting the
   // screenshot region.
   bool pen_events_only_ = false;
 
+  base::Closure on_screenshot_session_done_;
+
   // The data to build the screenshot region.
   gfx::Point start_position_;
   aura::Window* root_window_;
 
   // Currently selected window in WINDOW mode.
   aura::Window* selected_;
 
   // Layers to create the visual effect of region selection or selected window.
   std::map<aura::Window*, ScreenshotLayer*> layers_;
 
   // The object to specify the crosshair cursor.
   std::unique_ptr<ScopedCursorSetter> cursor_setter_;
 
   // ScreenshotDelegate to take the actual screenshot. No ownership.
   ScreenshotDelegate* screenshot_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenshotController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_UTILITY_SCREENSHOT_CONTROLLER_H_