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

ash/common/system/chromeos/palette/tools/capture_region_mode.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 "ash/common/system/chromeos/palette/tools/capture_region_mode.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/palette_delegate.h"
 #include "ash/common/system/chromeos/palette/palette_ids.h"
 #include "ash/common/system/toast/toast_data.h"
@@ skipping 19 matching lines @@
 
 PaletteGroup CaptureRegionMode::GetGroup() const {
   return PaletteGroup::MODE;
 }
 
 PaletteToolId CaptureRegionMode::GetToolId() const {
   return PaletteToolId::CAPTURE_REGION;
 }
 
 const gfx::VectorIcon& CaptureRegionMode::GetActiveTrayIcon() const {
-  // TODO(jdufault): Update to real icon once new tray icons are ready.
-  return kPaletteTrayIconMagnifyIcon;
+  return kPaletteTrayIconCaptureRegionIcon;
 }
 
 void CaptureRegionMode::OnEnable() {
   CommonPaletteTool::OnEnable();
 
   ToastData toast(kToastId, l10n_util::GetStringUTF16(
                                 IDS_ASH_STYLUS_TOOLS_CAPTURE_REGION_TOAST),
                   kToastDurationMs, base::string16());
   ash::WmShell::Get()->toast_manager()->Show(toast);
 
@@ skipping 18 matching lines @@
 const gfx::VectorIcon& CaptureRegionMode::GetPaletteIcon() const {
   return kPaletteActionCaptureRegionIcon;
 }
 
 void CaptureRegionMode::OnScreenshotDone() {
   // The screenshot finished, so disable the tool.
   delegate()->DisableTool(GetToolId());
 }
 
 }  // namespace ash