ChromeOS: Re-enable screenshot during OOBE.

Re-enable taking full screenshot in login screen.
File will be saved to temporary location.

Bug: 1180454
Test: Manual tested on DUT.

Change-Id: Ibdf464c1d0a575d5c5e968c4d425244b815207ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2733256
Commit-Queue: Judy Wang <shidi@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#862170}

ash/accelerators/accelerator_controller_impl.cc

@@ -741,11 +741,11 @@ void HandleShowKeyboardShortcutViewer() {
   NewWindowDelegate::GetInstance()->ShowKeyboardShortcutViewer();
 }
 
-bool CanHandleScreenshot() {
+bool CanHandleScreenshot(AcceleratorAction action) {
   // The old screenshot code will handle the different sessions in its own code.
-  if (!features::IsCaptureModeEnabled())
+  // |TAKE_SCREENSHOT| is allowed when user session is blocked.
+  if (!features::IsCaptureModeEnabled() || action == TAKE_SCREENSHOT)
     return true;
-
   return !Shell::Get()->session_controller()->IsUserSessionBlocked();
 }
 
@@ -793,9 +793,11 @@ void HandleTakeScreenshot(ui::KeyboardCode key_code) {
     return;
   }
 
-  // If it is the snip key, toggle capture mode.
+  // If it is the snip key, toggle capture mode unless the session is blocked,
+  // in which case, it behaves like a fullscreen screenshot.
   auto* capture_mode_controller = CaptureModeController::Get();
-  if (key_code == ui::VKEY_SNAPSHOT) {
+  if (key_code == ui::VKEY_SNAPSHOT &&
+      !Shell::Get()->session_controller()->IsUserSessionBlocked()) {
     if (capture_mode_controller->IsActive())
       capture_mode_controller->Stop();
     else
@@ -2034,7 +2036,7 @@ bool AcceleratorControllerImpl::CanPerformAction(
     case TAKE_PARTIAL_SCREENSHOT:
     case TAKE_SCREENSHOT:
     case TAKE_WINDOW_SCREENSHOT:
-      return CanHandleScreenshot();
+      return CanHandleScreenshot(action);
 
     // The following are always enabled.
     case BRIGHTNESS_DOWN:

ash/accelerators/accelerator_table.cc

@@ -173,6 +173,7 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
     START_AMBIENT_MODE,
     SWITCH_TO_LAST_USED_IME,
     SWITCH_TO_NEXT_IME,
+    TAKE_SCREENSHOT,
     TOGGLE_CAPS_LOCK,
     TOGGLE_DICTATION,
     TOGGLE_DOCKED_MAGNIFIER,
@@ -198,9 +199,6 @@ const size_t kActionsAllowedAtLoginOrLockScreenLength =
 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
     EXIT,
     SUSPEND,
-    TAKE_PARTIAL_SCREENSHOT,
-    TAKE_SCREENSHOT,
-    TAKE_WINDOW_SCREENSHOT,
 };
 
 const size_t kActionsAllowedAtLockScreenLength =

ash/capture_mode/capture_mode_controller.cc

@@ -952,7 +952,7 @@ void CaptureModeController::ShowPreviewNotification(
   message_center::RichNotificationData optional_fields;
   message_center::ButtonInfo edit_button(
       l10n_util::GetStringUTF16(IDS_ASH_SCREEN_CAPTURE_BUTTON_EDIT));
-  if (!for_video)
+  if (!for_video && !Shell::Get()->session_controller()->IsUserSessionBlocked())
     optional_fields.buttons.push_back(edit_button);
   message_center::ButtonInfo delete_button(
       l10n_util::GetStringUTF16(IDS_ASH_SCREEN_CAPTURE_BUTTON_DELETE));
@@ -1032,7 +1032,7 @@ base::FilePath CaptureModeController::BuildImagePathForDisplay(
 base::FilePath CaptureModeController::BuildPathNoExtension(
     const char* const format_string,
     base::Time timestamp) const {
-  const base::FilePath path = delegate_->GetActiveUserDownloadsDir();
+  const base::FilePath path = delegate_->GetScreenCaptureDir();
   base::Time::Exploded exploded_time;
   timestamp.LocalExplode(&exploded_time);
 

ash/capture_mode/test_capture_mode_delegate.cc

@@ -129,7 +129,7 @@ gfx::Size TestCaptureModeDelegate::GetCurrentVideoSize() const {
   return fake_service_ ? fake_service_->video_size() : gfx::Size();
 }
 
-base::FilePath TestCaptureModeDelegate::GetActiveUserDownloadsDir() const {
+base::FilePath TestCaptureModeDelegate::GetScreenCaptureDir() const {
   return fake_downloads_dir_;
 }
 

ash/capture_mode/test_capture_mode_delegate.h

@@ -34,7 +34,7 @@ class TestCaptureModeDelegate : public CaptureModeDelegate {
   gfx::Size GetCurrentVideoSize() const;
 
   // CaptureModeDelegate:
-  base::FilePath GetActiveUserDownloadsDir() const override;
+  base::FilePath GetScreenCaptureDir() const override;
   void ShowScreenCaptureItemInFolder(const base::FilePath& file_path) override;
   void OpenScreenshotInImageEditor(const base::FilePath& file_path) override;
   bool Uses24HourFormat() const override;

ash/public/cpp/capture_mode_delegate.h

@@ -37,9 +37,9 @@ class ASH_PUBLIC_EXPORT CaptureModeDelegate {
  public:
   virtual ~CaptureModeDelegate() = default;
 
-  // Returns the path to the active user's downloads directory. This will never
-  // be called if the user is not logged in.
-  virtual base::FilePath GetActiveUserDownloadsDir() const = 0;
+  // Returns the path to save screen capture files based on user login status.
+  // If no user is logged in, returns the temporary directory.
+  virtual base::FilePath GetScreenCaptureDir() const = 0;
 
   // Shows the screenshot or screen recording item in the screen capture folder.
   virtual void ShowScreenCaptureItemInFolder(

chrome/browser/ui/ash/chrome_capture_mode_delegate.cc

@@ -7,6 +7,7 @@
 #include "ash/services/recording/public/mojom/recording_service.mojom.h"
 #include "base/check.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/i18n/time_formatting.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
@@ -72,11 +73,16 @@ void ChromeCaptureModeDelegate::InterruptVideoRecordingIfAny() {
     std::move(interrupt_video_recording_callback_).Run();
 }
 
-base::FilePath ChromeCaptureModeDelegate::GetActiveUserDownloadsDir() const {
-  DCHECK(chromeos::LoginState::Get()->IsUserLoggedIn());
-  DownloadPrefs* download_prefs =
-      DownloadPrefs::FromBrowserContext(ProfileManager::GetActiveUserProfile());
-  return download_prefs->DownloadPath();
+base::FilePath ChromeCaptureModeDelegate::GetScreenCaptureDir() const {
+  if (chromeos::LoginState::Get()->IsUserLoggedIn()) {
+    DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(
+        ProfileManager::GetActiveUserProfile());
+    return download_prefs->DownloadPath();
+  }
+  base::FilePath tmp_dir;
+  if (!base::GetTempDir(&tmp_dir))
+    LOG(ERROR) << "Failed to find temporary directory.";
+  return tmp_dir;
 }
 
 void ChromeCaptureModeDelegate::ShowScreenCaptureItemInFolder(

chrome/browser/ui/ash/chrome_capture_mode_delegate.h

@@ -31,7 +31,7 @@ class ChromeCaptureModeDelegate : public ash::CaptureModeDelegate {
   void InterruptVideoRecordingIfAny();
 
   // ash::CaptureModeDelegate:
-  base::FilePath GetActiveUserDownloadsDir() const override;
+  base::FilePath GetScreenCaptureDir() const override;
   void ShowScreenCaptureItemInFolder(const base::FilePath& file_path) override;
   void OpenScreenshotInImageEditor(const base::FilePath& file_path) override;
   bool Uses24HourFormat() const override;