Allow taking screen shot of a non child window which has delegate to paint.

ash/accelerators/accelerator_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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <utility>
@@ skipping 26 matching lines @@
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness_control_delegate.h"
 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/touch/touch_hud_debug.h"
-#include "ash/utility/partial_screenshot_controller.h"
+#include "ash/utility/screenshot_controller.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_event.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
@@ skipping 395 matching lines @@
   return ime_control_delegate &&
       ime_control_delegate->CanSwitchIme(accelerator);
 }
 
 void HandleSwitchIme(ImeControlDelegate* ime_control_delegate,
                      const ui::Accelerator& accelerator) {
   base::RecordAction(UserMetricsAction("Accel_Switch_Ime"));
   ime_control_delegate->HandleSwitchIme(accelerator);
 }
 
-void HandleTakeActiveWindowScreenshot(ScreenshotDelegate* screenshot_delegate) {
+void HandleTakeWindowScreenshot(ScreenshotDelegate* screenshot_delegate) {
   base::RecordAction(UserMetricsAction("Accel_Take_Window_Screenshot"));
-  aura::Window* active_window = wm::GetActiveWindow();
-  if (!active_window)
-    return;
   DCHECK(screenshot_delegate);
-  if (screenshot_delegate->CanTakeScreenshot())
-    screenshot_delegate->HandleTakeWindowScreenshot(active_window);
+  Shell::GetInstance()->screenshot_controller()->StartWindowScreenshotSession(
+      screenshot_delegate);
 }
 
 void HandleTakePartialScreenshot(ScreenshotDelegate* screenshot_delegate) {
   base::RecordAction(UserMetricsAction("Accel_Take_Partial_Screenshot"));
   DCHECK(screenshot_delegate);
-  Shell::GetInstance()
-      ->partial_screenshot_controller()
-      ->StartPartialScreenshotSession(screenshot_delegate);
+  Shell::GetInstance()->screenshot_controller()->StartPartialScreenshotSession(
+      screenshot_delegate);
 }
 
 void HandleTakeScreenshot(ScreenshotDelegate* screenshot_delegate) {
   base::RecordAction(UserMetricsAction("Accel_Take_Screenshot"));
   DCHECK(screenshot_delegate);
   if (screenshot_delegate->CanTakeScreenshot())
     screenshot_delegate->HandleTakeScreenshotForAllRootWindows();
 }
 
 bool CanHandleToggleAppList(const ui::Accelerator& accelerator,
@@ skipping 594 matching lines @@
     case NEW_TAB:
     case NEW_WINDOW:
     case OPEN_FEEDBACK_PAGE:
     case PRINT_UI_HIERARCHIES:
     case RESTORE_TAB:
     case ROTATE_SCREEN:
     case ROTATE_WINDOW:
     case SHOW_KEYBOARD_OVERLAY:
     case SHOW_SYSTEM_TRAY_BUBBLE:
     case SHOW_TASK_MANAGER:
-    case TAKE_ACTIVE_WINDOW_SCREENSHOT:
+    case TAKE_WINDOW_SCREENSHOT:
     case TAKE_PARTIAL_SCREENSHOT:
     case TAKE_SCREENSHOT:
     case TOGGLE_FULLSCREEN:
     case TOGGLE_MAXIMIZED:
     case TOGGLE_OVERVIEW:
     case WINDOW_MINIMIZE:
 #if defined(OS_CHROMEOS)
     case BRIGHTNESS_DOWN:
     case BRIGHTNESS_UP:
     case DISABLE_GPU_WATCHDOG:
@@ skipping 151 matching lines @@
       break;
     case SHOW_SYSTEM_TRAY_BUBBLE:
       HandleShowSystemTrayBubble();
       break;
     case SHOW_TASK_MANAGER:
       HandleShowTaskManager();
       break;
     case SWITCH_IME:
       HandleSwitchIme(ime_control_delegate_.get(), accelerator);
       break;
-    case TAKE_ACTIVE_WINDOW_SCREENSHOT:
-      HandleTakeActiveWindowScreenshot(screenshot_delegate_.get());
+    case TAKE_WINDOW_SCREENSHOT:
+      HandleTakeWindowScreenshot(screenshot_delegate_.get());
       break;
     case TAKE_PARTIAL_SCREENSHOT:
       HandleTakePartialScreenshot(screenshot_delegate_.get());
       break;
     case TAKE_SCREENSHOT:
       HandleTakeScreenshot(screenshot_delegate_.get());
       break;
     case TOGGLE_APP_LIST:
       HandleToggleAppList(accelerator);
       break;
@@ skipping 166 matching lines @@
 }
 
 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
     std::unique_ptr<KeyboardBrightnessControlDelegate>
         keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       std::move(keyboard_brightness_control_delegate);
 }
 
 }  // namespace ash