Allow the user to cancel the capture region action, and show its active status in the tray.

chrome/browser/ui/ash/palette_delegate_chromeos.cc

 // Copyright 2016 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 "chrome/browser/ui/ash/palette_delegate_chromeos.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/utility/screenshot_controller.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/note_taking_app_utils.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/events/devices/input_device_manager.h"
 
 namespace chromeos {
 
+class PaletteDelegateChromeOS::ProxyScreenshotDelegate
+    : public ash::ScreenshotDelegate {
+ public:
+  ProxyScreenshotDelegate(ash::ScreenshotDelegate* delegate,
+                          const base::Closure& on_partial_screenshot_taken)
+      : delegate_(delegate),
+        on_partial_screenshot_taken_(on_partial_screenshot_taken) {}
+  ~ProxyScreenshotDelegate() override {}
+
+ private:
+  // ash::ScreenshotDelegate:
+  void HandleTakeScreenshotForAllRootWindows() override {
+    return delegate_->HandleTakeScreenshotForAllRootWindows();
+  }
+  void HandleTakePartialScreenshot(aura::Window* window,
+                                   const gfx::Rect& rect) override {
+    delegate_->HandleTakePartialScreenshot(window, rect);
+
+    // Run the delegate last, as it may delete this object.
+    if (on_partial_screenshot_taken_)
+      on_partial_screenshot_taken_.Run();
+  }
+  void HandleTakeWindowScreenshot(aura::Window* window) override {
+    return delegate_->HandleTakeWindowScreenshot(window);

[oshima, 2016/09/02 13:55:19]

just q: are you going to do the same for this mode? 

[jdufault, 2016/09/02 19:46:31]

Not planned right now, because that is an instantaneous action that does not
have user feedback.

+  }
+  bool CanTakeScreenshot() override { return delegate_->CanTakeScreenshot(); }
+
+  ash::ScreenshotDelegate* delegate_;

[oshima, 2016/09/02 13:55:19]

nit: document ownership

[jdufault, 2016/09/02 19:46:31]

Done.

+  base::Closure on_partial_screenshot_taken_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProxyScreenshotDelegate);
+};
+
 // static
 std::unique_ptr<PaletteDelegateChromeOS> PaletteDelegateChromeOS::Create() {
   if (!ash::IsPaletteFeatureEnabled())
     return nullptr;
   return base::WrapUnique(new PaletteDelegateChromeOS());
 }
 
-PaletteDelegateChromeOS::PaletteDelegateChromeOS() {
+PaletteDelegateChromeOS::PaletteDelegateChromeOS() : weak_factory_(this) {
   registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                  content::NotificationService::AllSources());
 
   ui::InputDeviceManager::GetInstance()->AddObserver(this);
 }
 
 PaletteDelegateChromeOS::~PaletteDelegateChromeOS() {
   ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
@@ skipping 71 matching lines @@
   pref_change_registrar_->Init(prefs);
   pref_change_registrar_->Add(
       prefs::kEnableStylusTools,
       base::Bind(&PaletteDelegateChromeOS::OnPaletteEnabledPrefChanged,
                  base::Unretained(this)));
 
   // Run listener with new pref value, if any.
   OnPaletteEnabledPrefChanged();
 }
 
+void PaletteDelegateChromeOS::OnPartialScreenshotDone(
+    const base::Closure& then) {
+  proxy_screenshot_delegate_.reset();
+  if (then)
+    then.Run();
+}
+
 void PaletteDelegateChromeOS::SetPartialMagnifierState(bool enabled) {
   ash::PartialMagnificationController* controller =
       ash::Shell::GetInstance()->partial_magnification_controller();
   controller->SetEnabled(enabled);
 }
 
 void PaletteDelegateChromeOS::SetStylusStateChangedCallback(
     const OnStylusStateChangedCallback& on_stylus_state_changed) {
   on_stylus_state_changed_ = on_stylus_state_changed;
 }
@@ skipping 12 matching lines @@
   return profile_->GetPrefs()->GetBoolean(prefs::kEnableStylusTools);
 }
 
 void PaletteDelegateChromeOS::TakeScreenshot() {
   auto* screenshot_delegate = ash::Shell::GetInstance()
                                   ->accelerator_controller_delegate()
                                   ->screenshot_delegate();
   screenshot_delegate->HandleTakeScreenshotForAllRootWindows();
 }
 
-void PaletteDelegateChromeOS::TakePartialScreenshot() {
+void PaletteDelegateChromeOS::TakePartialScreenshot(const base::Closure& done) {
   auto* screenshot_controller =
       ash::Shell::GetInstance()->screenshot_controller();
   auto* screenshot_delegate = ash::Shell::GetInstance()
                                   ->accelerator_controller_delegate()
                                   ->screenshot_delegate();
 
+  proxy_screenshot_delegate_ = base::MakeUnique<ProxyScreenshotDelegate>(
+      screenshot_delegate,
+      base::Bind(&PaletteDelegateChromeOS::OnPartialScreenshotDone,
+                 weak_factory_.GetWeakPtr(), done));
+
   screenshot_controller->set_pen_events_only(true);
   screenshot_controller->StartPartialScreenshotSession(
-      screenshot_delegate, false /* draw_overlay_immediately */);
+      proxy_screenshot_delegate_.get(), false /* draw_overlay_immediately */);
+}
+
+void PaletteDelegateChromeOS::CancelPartialScreenshot() {
+  ash::Shell::GetInstance()->screenshot_controller()->CancelScreenshotSession();
 }
 
 void PaletteDelegateChromeOS::OnStylusStateChanged(ui::StylusState state) {
   on_stylus_state_changed_.Run(state);
 }
 
 }  // namespace chromeos