Add "Copy to clipboard" button to screenshot preview

This button will copy the screenshot to the clipboard

Author: sangwoo108

app/brave_generated_resources.grd

@@ -635,6 +635,9 @@ Or change later at <ph name="SETTINGS_EXTENIONS_LINK">$2<ex>brave://settings/ext
       <message name="IDS_BRAVE_SCREENSHOT_PREVIEW_DIALOG_DOWNLOAD_BUTTON" desc="Label of the button in the screenshot preview dialog that proceeds to save the screenshot">
         Download
       </message>
+      <message name="IDS_BRAVE_SCREENSHOT_PREVIEW_DIALOG_COPY_BUTTON" desc="Label of the button in the screenshot preview dialog that copies the screenshot to clipboard">
+        Copy to clipboard
+      </message>
 
       <!-- Extensions page strings -->
       <message name="IDS_EXTENSIONS_BRAVE_ITEM_SOURCE_WEBSTORE" desc="The text to indicate that an extension is from the Web Extensions Store.">

browser/ui/screenshot/screenshot_controller.cc

@@ -32,6 +32,7 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkRect.h"
+#include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
@@ -339,17 +340,33 @@ void ScreenshotController::OnEncoded(std::optional<std::vector<uint8_t>> png) {
 
 void ScreenshotController::ShowPreviewDialog(std::vector<uint8_t> png) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  // The dialog takes ownership of `png` for display and hands the same bytes
-  // back to ShowSaveDialog() via `on_download` if the user confirms, so
-  // there's never a need for a second copy here.
+  // The dialog takes ownership of `png` for display.
+  // `on_download`: user clicked Download -> proceed to ShowSaveDialog()
+  // `on_copy`: user clicked Copy -> copy to clipboard and finish
+  // `on_cancel`: user closed the dialog -> finish with error
   preview_dialog_shower_.Run(
       parent_window_getter_.Run(), std::move(png),
       base::BindOnce(&ScreenshotController::ShowSaveDialog,
                      weak_factory_.GetWeakPtr()),
+      base::BindOnce(&ScreenshotController::CopyToClipboard,
+                     weak_factory_.GetWeakPtr()),
       base::BindOnce(&ScreenshotController::FinishWithError,
                      weak_factory_.GetWeakPtr(), Error::kUserCancelled));
 }
 
+void ScreenshotController::CopyToClipboard(std::vector<uint8_t> png) {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  SkBitmap bitmap = gfx::PNGCodec::Decode(png);
+  ui::ScopedClipboardWriter clipboard_writer(ui::ClipboardBuffer::kCopyPaste);
+  clipboard_writer.WriteImage(bitmap);
+  auto cb = std::move(pending_callback_);
+  Reset();
+  if (cb) {
+    std::move(cb).Run(base::FilePath());  // No path to return for clipboard
+                                          // copy, but still signal success.
+  }
+}
+
 void ScreenshotController::ShowSaveDialog(std::vector<uint8_t> png) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   pending_png_ = std::move(png);

browser/ui/screenshot/screenshot_controller.h

@@ -57,13 +57,14 @@ class ScreenshotController : public ui::SelectFileDialog::Listener {
   using NativeWindowGetter = base::RepeatingCallback<gfx::NativeWindow()>;
 
   // Shows a preview of the captured `png` and asks the user to confirm
-  // before saving. Exactly one of `on_download` (with `png` handed back) or
-  // `on_cancel` is run once, depending on whether the user confirms or
-  // dismisses the dialog.
+  // before saving. Exactly one of `on_download` (with `png` handed back),
+  // `on_copy`, or `on_cancel` is run once, depending on whether the user
+  // confirms (download), copies to clipboard, or dismisses the dialog.
   using PreviewDialogShower = base::RepeatingCallback<void(
       gfx::NativeWindow parent,
       std::vector<uint8_t> png,
       base::OnceCallback<void(std::vector<uint8_t>)> on_download,
+      base::OnceCallback<void(std::vector<uint8_t>)> on_copy,
       base::OnceClosure on_cancel)>;
 
   ScreenshotController(content::BrowserContext* profile,
@@ -121,10 +122,13 @@ class ScreenshotController : public ui::SelectFileDialog::Listener {
 
   void OnEncoded(std::optional<std::vector<uint8_t>> png);
   // Shows the preview dialog for `png`; proceeds to ShowSaveDialog() if the
-  // user clicks Download, or finishes with kUserCancelled otherwise.
+  // user clicks Download, copies to clipboard via OnCopiedToClipboard() if
+  // they click Copy, or finishes with kUserCancelled otherwise.
   void ShowPreviewDialog(std::vector<uint8_t> png);
   void ShowSaveDialog(std::vector<uint8_t> png);
   void ShowSaveDialogWithPath(const base::FilePath& default_path);
+  void CopyToClipboard(std::vector<uint8_t> png);
+
   // Reply callback for WritePngFile posted from FileSelected().
   void OnFileWritten(const base::FilePath& path, bool ok);
   void FinishWithError(Error error);

browser/ui/screenshot/screenshot_controller_unittest.cc

@@ -52,6 +52,7 @@ class ScreenshotControllerTest : public ChromeRenderViewHostTestHarness {
       gfx::NativeWindow parent,
       std::vector<uint8_t> png,
       base::OnceCallback<void(std::vector<uint8_t>)> on_download,
+      base::OnceClosure on_copy,
       base::OnceClosure on_cancel) {
     std::move(on_download).Run(std::move(png));
   }

browser/ui/views/toolbar/screenshot_preview_dialog.cc

@@ -14,6 +14,7 @@
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/platform_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/image_model.h"
 #include "ui/base/mojom/ui_base_types.mojom-shared.h"
@@ -72,13 +73,17 @@ class ScreenshotPreviewDialogDelegate : public views::DialogDelegate {
     SetModalType(ui::mojom::ModalType::kWindow);
     SetTitle(
         l10n_util::GetStringUTF16(IDS_BRAVE_SCREENSHOT_PREVIEW_DIALOG_TITLE));
-    // Only the Download action is a button; dismissal happens via the frame's
-    // close (X) control or Esc, both surfaced as a non-accept ClosedReason to
-    // ScreenshotPreviewDialogHolder::OnClosed() below.
-    SetButtons(static_cast<int>(ui::mojom::DialogButton::kOk));
+    // Add both Download and Copy to clipboard buttons.
+    // Download button is mapped to the OK button, Copy to clipboard is mapped
+    // to the Cancel button.
+    SetButtons(static_cast<int>(ui::mojom::DialogButton::kOk) |
+               static_cast<int>(ui::mojom::DialogButton::kCancel));
     SetButtonLabel(ui::mojom::DialogButton::kOk,
                    l10n_util::GetStringUTF16(
                        IDS_BRAVE_SCREENSHOT_PREVIEW_DIALOG_DOWNLOAD_BUTTON));
+    SetButtonLabel(ui::mojom::DialogButton::kCancel,
+                   l10n_util::GetStringUTF16(
+                       IDS_BRAVE_SCREENSHOT_PREVIEW_DIALOG_COPY_BUTTON));
     SetShowCloseButton(true);
 
     // Same content margins Chrome's own screenshot-captured bubble uses
@@ -104,10 +109,12 @@ class ScreenshotPreviewDialogHolder {
       gfx::NativeWindow parent,
       std::vector<uint8_t> png,
       base::OnceCallback<void(std::vector<uint8_t>)> on_download,
+      base::OnceCallback<void(std::vector<uint8_t>)> on_copy,
       base::OnceClosure on_cancel)
       : delegate_(
             std::make_unique<ScreenshotPreviewDialogDelegate>(std::move(png))),
         on_download_(std::move(on_download)),
+        on_copy_(std::move(on_copy)),
         on_cancel_(std::move(on_cancel)) {
     widget_.reset(views::DialogDelegate::CreateDialogWidget(
         delegate_.get(), gfx::NativeWindow(),
@@ -125,6 +132,8 @@ class ScreenshotPreviewDialogHolder {
     widget_.reset();
     if (reason == views::Widget::ClosedReason::kAcceptButtonClicked) {
       std::move(on_download_).Run(delegate_->TakePng());
+    } else if (reason == views::Widget::ClosedReason::kCancelButtonClicked) {
+      std::move(on_copy_).Run(delegate_->TakePng());
     } else {
       std::move(on_cancel_).Run();
     }
@@ -134,6 +143,7 @@ class ScreenshotPreviewDialogHolder {
   std::unique_ptr<ScreenshotPreviewDialogDelegate> delegate_;
   std::unique_ptr<views::Widget> widget_;
   base::OnceCallback<void(std::vector<uint8_t>)> on_download_;
+  base::OnceCallback<void(std::vector<uint8_t>)> on_copy_;
   base::OnceClosure on_cancel_;
 };
 
@@ -143,9 +153,11 @@ void ShowScreenshotPreviewDialog(
     gfx::NativeWindow parent,
     std::vector<uint8_t> png,
     base::OnceCallback<void(std::vector<uint8_t>)> on_download,
+    base::OnceCallback<void(std::vector<uint8_t>)> on_copy,
     base::OnceClosure on_cancel) {
-  new ScreenshotPreviewDialogHolder(
-      parent, std::move(png), std::move(on_download), std::move(on_cancel));
+  new ScreenshotPreviewDialogHolder(parent, std::move(png),
+                                    std::move(on_download), std::move(on_copy),
+                                    std::move(on_cancel));
 }
 
 }  // namespace screenshot

browser/ui/views/toolbar/screenshot_preview_dialog.h

@@ -17,12 +17,14 @@ namespace screenshot {
 // Shows a modal dialog previewing the captured `png` in a scroll view,
 // taking ownership of it for the dialog's lifetime. Invokes `on_download`
 // with `png` handed back if the user clicks the Download button, or
-// `on_cancel` if they dismiss the dialog (Esc or closing the window).
-// Exactly one of the two is run, exactly once.
+// `on_copy` if they click the Copy to clipboard button, or `on_cancel`
+// if they dismiss the dialog (Esc or closing the window).
+// Exactly one of the three is run, exactly once.
 void ShowScreenshotPreviewDialog(
     gfx::NativeWindow parent,
     std::vector<uint8_t> png,
     base::OnceCallback<void(std::vector<uint8_t>)> on_download,
+    base::OnceCallback<void(std::vector<uint8_t>)> on_copy,
     base::OnceClosure on_cancel);
 
 }  // namespace screenshot

browser/ui/views/toolbar/screenshot_preview_dialog_browsertest.cc

@@ -106,11 +106,12 @@ IN_PROC_BROWSER_TEST_F(ScreenshotPreviewDialogBrowserTest,
                        DownloadButton_RunsOnDownloadAndClosesWidget) {
   PreviewWidgetWaiter widget_waiter;
   base::test::TestFuture<std::vector<uint8_t>> on_download;
+  base::test::TestFuture<std::vector<uint8_t>> on_copy;
   base::test::TestFuture<void> on_cancel;
 
   std::vector<uint8_t> png = MakeTestPng();
   ShowScreenshotPreviewDialog(browser()->GetWindow()->GetNativeWindow(), png,
-                              on_download.GetCallback(),
+                              on_download.GetCallback(), on_copy.GetCallback(),
                               on_cancel.GetCallback());
 
   views::Widget* widget = widget_waiter.Wait();
@@ -120,6 +121,7 @@ IN_PROC_BROWSER_TEST_F(ScreenshotPreviewDialogBrowserTest,
   widget->widget_delegate()->AsDialogDelegate()->AcceptDialog();
 
   EXPECT_EQ(on_download.Get(), png);
+  EXPECT_FALSE(on_copy.IsReady());
   EXPECT_FALSE(on_cancel.IsReady());
   destruction_waiter.Wait();
 }
@@ -128,11 +130,12 @@ IN_PROC_BROWSER_TEST_F(ScreenshotPreviewDialogBrowserTest,
                        EscapeKey_RunsOnCancelAndClosesWidget) {
   PreviewWidgetWaiter widget_waiter;
   base::test::TestFuture<std::vector<uint8_t>> on_download;
+  base::test::TestFuture<std::vector<uint8_t>> on_copy;
   base::test::TestFuture<void> on_cancel;
 
   ShowScreenshotPreviewDialog(browser()->GetWindow()->GetNativeWindow(),
                               MakeTestPng(), on_download.GetCallback(),
-                              on_cancel.GetCallback());
+                              on_copy.GetCallback(), on_cancel.GetCallback());
 
   views::Widget* widget = widget_waiter.Wait();
   ASSERT_TRUE(widget);
@@ -142,18 +145,20 @@ IN_PROC_BROWSER_TEST_F(ScreenshotPreviewDialogBrowserTest,
 
   EXPECT_TRUE(on_cancel.Wait());
   EXPECT_FALSE(on_download.IsReady());
+  EXPECT_FALSE(on_copy.IsReady());
   destruction_waiter.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenshotPreviewDialogBrowserTest,
                        CloseButton_RunsOnCancelAndClosesWidget) {
   PreviewWidgetWaiter widget_waiter;
   base::test::TestFuture<std::vector<uint8_t>> on_download;
+  base::test::TestFuture<std::vector<uint8_t>> on_copy;
   base::test::TestFuture<void> on_cancel;
 
   ShowScreenshotPreviewDialog(browser()->GetWindow()->GetNativeWindow(),
                               MakeTestPng(), on_download.GetCallback(),
-                              on_cancel.GetCallback());
+                              on_copy.GetCallback(), on_cancel.GetCallback());
 
   views::Widget* widget = widget_waiter.Wait();
   ASSERT_TRUE(widget);
@@ -163,6 +168,7 @@ IN_PROC_BROWSER_TEST_F(ScreenshotPreviewDialogBrowserTest,
 
   EXPECT_TRUE(on_cancel.Wait());
   EXPECT_FALSE(on_download.IsReady());
+  EXPECT_FALSE(on_copy.IsReady());
   destruction_waiter.Wait();
 }