 Chromium Code Reviews
 Chromium Code Reviews Issue 1827323002:
  Take screenshot of active window  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1827323002:
  Take screenshot of active window  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW | 
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "ash/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 #include <cmath> | 8 #include <cmath> | 
| 9 #include <string> | 9 #include <string> | 
| 10 #include <utility> | 10 #include <utility> | 
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 452 return ime_control_delegate && | 452 return ime_control_delegate && | 
| 453 ime_control_delegate->CanSwitchIme(accelerator); | 453 ime_control_delegate->CanSwitchIme(accelerator); | 
| 454 } | 454 } | 
| 455 | 455 | 
| 456 void HandleSwitchIme(ImeControlDelegate* ime_control_delegate, | 456 void HandleSwitchIme(ImeControlDelegate* ime_control_delegate, | 
| 457 const ui::Accelerator& accelerator) { | 457 const ui::Accelerator& accelerator) { | 
| 458 base::RecordAction(UserMetricsAction("Accel_Switch_Ime")); | 458 base::RecordAction(UserMetricsAction("Accel_Switch_Ime")); | 
| 459 ime_control_delegate->HandleSwitchIme(accelerator); | 459 ime_control_delegate->HandleSwitchIme(accelerator); | 
| 460 } | 460 } | 
| 461 | 461 | 
| 462 void HandleTakeActiveWindowScreenshot(ScreenshotDelegate* screenshot_delegate) { | |
| 463 base::RecordAction(UserMetricsAction("Accel_Take_Window_Screenshot")); | |
| 464 DCHECK(screenshot_delegate); | |
| 465 aura::Window* current_window = wm::GetActiveWindow(); | |
| 466 if (screenshot_delegate->CanTakeScreenshot()) | |
| 
sky
2016/03/25 15:27:53
Early out if current_window is null? Also, current
 
Qiang(Joe) Xu
2016/03/25 19:09:40
I added:
if (!active_window)
  return;
once this
 | |
| 467 screenshot_delegate->HandleTakeWindowScreenshot(current_window); | |
| 468 } | |
| 469 | |
| 462 void HandleTakePartialScreenshot(ScreenshotDelegate* screenshot_delegate) { | 470 void HandleTakePartialScreenshot(ScreenshotDelegate* screenshot_delegate) { | 
| 463 base::RecordAction(UserMetricsAction("Accel_Take_Partial_Screenshot")); | 471 base::RecordAction(UserMetricsAction("Accel_Take_Partial_Screenshot")); | 
| 464 DCHECK(screenshot_delegate); | 472 DCHECK(screenshot_delegate); | 
| 465 Shell::GetInstance() | 473 Shell::GetInstance() | 
| 466 ->partial_screenshot_controller() | 474 ->partial_screenshot_controller() | 
| 467 ->StartPartialScreenshotSession(screenshot_delegate); | 475 ->StartPartialScreenshotSession(screenshot_delegate); | 
| 468 } | 476 } | 
| 469 | 477 | 
| 470 void HandleTakeScreenshot(ScreenshotDelegate* screenshot_delegate) { | 478 void HandleTakeScreenshot(ScreenshotDelegate* screenshot_delegate) { | 
| 471 base::RecordAction(UserMetricsAction("Accel_Take_Screenshot")); | 479 base::RecordAction(UserMetricsAction("Accel_Take_Screenshot")); | 
| (...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1074 case NEW_TAB: | 1082 case NEW_TAB: | 
| 1075 case NEW_WINDOW: | 1083 case NEW_WINDOW: | 
| 1076 case OPEN_FEEDBACK_PAGE: | 1084 case OPEN_FEEDBACK_PAGE: | 
| 1077 case PRINT_UI_HIERARCHIES: | 1085 case PRINT_UI_HIERARCHIES: | 
| 1078 case RESTORE_TAB: | 1086 case RESTORE_TAB: | 
| 1079 case ROTATE_SCREEN: | 1087 case ROTATE_SCREEN: | 
| 1080 case ROTATE_WINDOW: | 1088 case ROTATE_WINDOW: | 
| 1081 case SHOW_KEYBOARD_OVERLAY: | 1089 case SHOW_KEYBOARD_OVERLAY: | 
| 1082 case SHOW_SYSTEM_TRAY_BUBBLE: | 1090 case SHOW_SYSTEM_TRAY_BUBBLE: | 
| 1083 case SHOW_TASK_MANAGER: | 1091 case SHOW_TASK_MANAGER: | 
| 1092 case TAKE_ACTIVE_WINDOW_SCREENSHOT: | |
| 1084 case TAKE_PARTIAL_SCREENSHOT: | 1093 case TAKE_PARTIAL_SCREENSHOT: | 
| 1085 case TAKE_SCREENSHOT: | 1094 case TAKE_SCREENSHOT: | 
| 1086 case TOGGLE_FULLSCREEN: | 1095 case TOGGLE_FULLSCREEN: | 
| 1087 case TOGGLE_MAXIMIZED: | 1096 case TOGGLE_MAXIMIZED: | 
| 1088 case TOGGLE_OVERVIEW: | 1097 case TOGGLE_OVERVIEW: | 
| 1089 case WINDOW_MINIMIZE: | 1098 case WINDOW_MINIMIZE: | 
| 1090 #if defined(OS_CHROMEOS) | 1099 #if defined(OS_CHROMEOS) | 
| 1091 case BRIGHTNESS_DOWN: | 1100 case BRIGHTNESS_DOWN: | 
| 1092 case BRIGHTNESS_UP: | 1101 case BRIGHTNESS_UP: | 
| 1093 case DISABLE_GPU_WATCHDOG: | 1102 case DISABLE_GPU_WATCHDOG: | 
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1245 break; | 1254 break; | 
| 1246 case SHOW_SYSTEM_TRAY_BUBBLE: | 1255 case SHOW_SYSTEM_TRAY_BUBBLE: | 
| 1247 HandleShowSystemTrayBubble(); | 1256 HandleShowSystemTrayBubble(); | 
| 1248 break; | 1257 break; | 
| 1249 case SHOW_TASK_MANAGER: | 1258 case SHOW_TASK_MANAGER: | 
| 1250 HandleShowTaskManager(); | 1259 HandleShowTaskManager(); | 
| 1251 break; | 1260 break; | 
| 1252 case SWITCH_IME: | 1261 case SWITCH_IME: | 
| 1253 HandleSwitchIme(ime_control_delegate_.get(), accelerator); | 1262 HandleSwitchIme(ime_control_delegate_.get(), accelerator); | 
| 1254 break; | 1263 break; | 
| 1264 case TAKE_ACTIVE_WINDOW_SCREENSHOT: | |
| 1265 HandleTakeActiveWindowScreenshot(screenshot_delegate_.get()); | |
| 1266 break; | |
| 1255 case TAKE_PARTIAL_SCREENSHOT: | 1267 case TAKE_PARTIAL_SCREENSHOT: | 
| 1256 HandleTakePartialScreenshot(screenshot_delegate_.get()); | 1268 HandleTakePartialScreenshot(screenshot_delegate_.get()); | 
| 1257 break; | 1269 break; | 
| 1258 case TAKE_SCREENSHOT: | 1270 case TAKE_SCREENSHOT: | 
| 1259 HandleTakeScreenshot(screenshot_delegate_.get()); | 1271 HandleTakeScreenshot(screenshot_delegate_.get()); | 
| 1260 break; | 1272 break; | 
| 1261 case TOGGLE_APP_LIST: | 1273 case TOGGLE_APP_LIST: | 
| 1262 HandleToggleAppList(accelerator); | 1274 HandleToggleAppList(accelerator); | 
| 1263 break; | 1275 break; | 
| 1264 case TOGGLE_FULLSCREEN: | 1276 case TOGGLE_FULLSCREEN: | 
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1430 } | 1442 } | 
| 1431 | 1443 | 
| 1432 void AcceleratorController::SetKeyboardBrightnessControlDelegate( | 1444 void AcceleratorController::SetKeyboardBrightnessControlDelegate( | 
| 1433 scoped_ptr<KeyboardBrightnessControlDelegate> | 1445 scoped_ptr<KeyboardBrightnessControlDelegate> | 
| 1434 keyboard_brightness_control_delegate) { | 1446 keyboard_brightness_control_delegate) { | 
| 1435 keyboard_brightness_control_delegate_ = | 1447 keyboard_brightness_control_delegate_ = | 
| 1436 std::move(keyboard_brightness_control_delegate); | 1448 std::move(keyboard_brightness_control_delegate); | 
| 1437 } | 1449 } | 
| 1438 | 1450 | 
| 1439 } // namespace ash | 1451 } // namespace ash | 
| OLD | NEW |