Web Share: Support title/text/url sharing from web apps on ChromeOS

Web apps on Chrome OS may use the Web Share API to send title,
text and/or url, in addition to files.

If title, text and/or url ShareData fields have been supplied, they
are used to set the text and title for the Intent.

If the web app is sharing both a text string and a URL, we combine
them into a single string, with a space separator.
The same approach is already taken on Android:
https://source.chromium.org/chromium/chromium/src/+/master:components/browser_ui/share/android/java/src/org/chromium/components/browser_ui/share/ShareHelper.java;drc=28d989a1fc83edb779c034cad48572775696bc66;l=357

Not yet implemented or tested: sharing title/text/url without files.

Design doc:
https://docs.google.com/document/d/1EjpgseTbBhT9ogQv6HV6sLlBl4hpb2viOcmPtFJorMQ/edit#


Bug: 1127670
Change-Id: Ie56a372816602b71ff386dc1094be61610d70a79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2569329
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Reviewed-by: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833292}

chrome/browser/webshare/chromeos/sharesheet_client.cc

@@ -92,7 +92,7 @@ void SharesheetClient::Share(
   }
 
   if (files.empty()) {
-    // TODO(crbug.com/1127670): Support title/text/url sharing.
+    // TODO(crbug.com/1127670): Support title/text/url sharing without files.
     std::move(callback).Run(blink::mojom::ShareError::CANCELED);
     return;
   }
@@ -102,6 +102,15 @@ void SharesheetClient::Share(
   current_share_->directory =
       chromeos::CrosDisksClient::GetArchiveMountPoint().Append(
           kWebShareDirname);
+  if (share_url.is_valid()) {
+    if (text.empty())
+      current_share_->text = share_url.spec();
+    else
+      current_share_->text = text + " " + share_url.spec();
+  } else {
+    current_share_->text = text;
+  }
+  current_share_->title = title;
   current_share_->callback = std::move(callback);
 
   current_share_->prepare_directory_task =
@@ -155,7 +164,8 @@ void SharesheetClient::OnStoreFiles(blink::mojom::ShareError error) {
 
   GetSharesheetCallback().Run(
       web_contents(), std::move(current_share_->file_paths),
-      std::move(current_share_->content_types),
+      std::move(current_share_->content_types), current_share_->text,
+      current_share_->title,
       base::BindOnce(&SharesheetClient::OnShowSharesheet,
                      weak_ptr_factory_.GetWeakPtr()));
 }
@@ -166,10 +176,13 @@ void SharesheetClient::OnShowSharesheet(sharesheet::SharesheetResult result) {
 }
 
 // static
-void SharesheetClient::ShowSharesheet(content::WebContents* web_contents,
-                                      std::vector<base::FilePath> file_paths,
-                                      std::vector<std::string> content_types,
-                                      CloseCallback close_callback) {
+void SharesheetClient::ShowSharesheet(
+    content::WebContents* web_contents,
+    const std::vector<base::FilePath>& file_paths,
+    const std::vector<std::string>& content_types,
+    const std::string& text,
+    const std::string& title,
+    CloseCallback close_callback) {
   if (!base::FeatureList::IsEnabled(features::kSharesheet)) {
     std::move(close_callback).Run(sharesheet::SharesheetResult::kCancel);
     return;
@@ -184,8 +197,8 @@ void SharesheetClient::ShowSharesheet(content::WebContents* web_contents,
 
   sharesheet_service->ShowBubble(
       web_contents,
-      apps_util::CreateShareIntentFromFiles(profile, std::move(file_paths),
-                                            std::move(content_types)),
+      apps_util::CreateShareIntentFromFiles(profile, file_paths, content_types,
+                                            text, title),
       std::move(close_callback));
 }
 

chrome/browser/webshare/chromeos/sharesheet_client.h

@@ -28,11 +28,13 @@ class PrepareDirectoryTask;
 class SharesheetClient : public content::WebContentsObserver {
  public:
   using CloseCallback = sharesheet::CloseCallback;
-  using SharesheetCallback =
-      base::RepeatingCallback<void(content::WebContents* web_contents,
-                                   std::vector<base::FilePath> file_paths,
-                                   std::vector<std::string> content_types,
-                                   CloseCallback close_callback)>;
+  using SharesheetCallback = base::RepeatingCallback<void(
+      content::WebContents* web_contents,
+      const std::vector<base::FilePath>& file_paths,
+      const std::vector<std::string>& content_types,
+      const std::string& text,
+      const std::string& title,
+      CloseCallback close_callback)>;
 
   explicit SharesheetClient(content::WebContents* web_contents);
   SharesheetClient(const SharesheetClient&) = delete;
@@ -55,8 +57,10 @@ class SharesheetClient : public content::WebContentsObserver {
   void OnShowSharesheet(sharesheet::SharesheetResult result);
 
   static void ShowSharesheet(content::WebContents* web_contents,
-                             std::vector<base::FilePath> file_paths,
-                             std::vector<std::string> content_types,
+                             const std::vector<base::FilePath>& file_paths,
+                             const std::vector<std::string>& content_types,
+                             const std::string& text,
+                             const std::string& title,
                              CloseCallback close_callback);
 
   static SharesheetCallback& GetSharesheetCallback();
@@ -76,6 +80,8 @@ class SharesheetClient : public content::WebContentsObserver {
     base::FilePath directory;
     std::vector<base::FilePath> file_paths;
     std::vector<std::string> content_types;
+    std::string text;
+    std::string title;
     blink::mojom::ShareService::ShareCallback callback;
 
     std::unique_ptr<PrepareDirectoryTask> prepare_directory_task;

chrome/browser/webshare/chromeos/sharesheet_client_browsertest.cc

@@ -58,6 +58,29 @@ class SharesheetClientBrowserTest : public InProcessBrowserTest {
     return embedded_test_server()->GetURL("/webshare/index.html");
   }
 
+  void ConfirmShareText(const std::string& script,
+                        const char* expected_text,
+                        const char* expected_title) {
+    SharesheetClient::SetSharesheetCallbackForTesting(
+        base::BindLambdaForTesting(
+            [&expected_text, &expected_title](
+                content::WebContents* in_contents,
+                const std::vector<base::FilePath>& file_paths,
+                const std::vector<std::string>& content_types,
+                const std::string& text, const std::string& title,
+                SharesheetClient::CloseCallback close_callback) {
+              EXPECT_EQ(text, expected_text);
+              EXPECT_EQ(title, expected_title);
+              std::move(close_callback)
+                  .Run(sharesheet::SharesheetResult::kCancel);
+            }));
+
+    content::WebContents* const contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    EXPECT_EQ("share failed: AbortError: Share canceled",
+              content::EvalJs(contents, script));
+  }
+
  private:
   base::test::ScopedFeatureList feature_list_;
 };
@@ -72,8 +95,9 @@ IN_PROC_BROWSER_TEST_F(SharesheetClientBrowserTest, ShareTwoFiles) {
 
   SharesheetClient::SetSharesheetCallbackForTesting(base::BindLambdaForTesting(
       [contents, &file_paths](content::WebContents* in_contents,
-                              std::vector<base::FilePath> in_file_paths,
-                              std::vector<std::string> content_types,
+                              const std::vector<base::FilePath>& in_file_paths,
+                              const std::vector<std::string>& content_types,
+                              const std::string& text, const std::string& title,
                               SharesheetClient::CloseCallback close_callback) {
         EXPECT_EQ(contents, in_contents);
 
@@ -107,8 +131,9 @@ IN_PROC_BROWSER_TEST_F(SharesheetClientBrowserTest, RepeatedShare) {
         base::BindLambdaForTesting(
             [contents, &file_paths](
                 content::WebContents* in_contents,
-                std::vector<base::FilePath> in_file_paths,
-                std::vector<std::string> content_types,
+                const std::vector<base::FilePath>& in_file_paths,
+                const std::vector<std::string>& content_types,
+                const std::string& text, const std::string& title,
                 SharesheetClient::CloseCallback close_callback) {
               EXPECT_EQ(contents, in_contents);
 
@@ -136,8 +161,9 @@ IN_PROC_BROWSER_TEST_F(SharesheetClientBrowserTest, CancelledShare) {
   ui_test_utils::NavigateToURL(browser(), GetAppUrl());
   SharesheetClient::SetSharesheetCallbackForTesting(base::BindLambdaForTesting(
       [](content::WebContents* in_contents,
-         std::vector<base::FilePath> file_paths,
-         std::vector<std::string> content_types,
+         const std::vector<base::FilePath>& file_paths,
+         const std::vector<std::string>& content_types, const std::string& text,
+         const std::string& title,
          SharesheetClient::CloseCallback close_callback) {
         std::move(close_callback).Run(sharesheet::SharesheetResult::kCancel);
       }));
@@ -146,4 +172,24 @@ IN_PROC_BROWSER_TEST_F(SharesheetClientBrowserTest, CancelledShare) {
             content::EvalJs(contents, script));
 }
 
+IN_PROC_BROWSER_TEST_F(SharesheetClientBrowserTest, TextWithFile) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+  ui_test_utils::NavigateToURL(browser(), GetAppUrl());
+  ConfirmShareText("share_file_title()",
+                   /*expected_text=*/"",
+                   /*expected_title=*/"Subject");
+  ConfirmShareText("share_file_title_url()",
+                   /*expected_text=*/"https://example.com/",
+                   /*expected_title=*/"Subject");
+  ConfirmShareText("share_file_text()",
+                   /*expected_text=*/"Message",
+                   /*expected_title=*/"");
+  ConfirmShareText("share_file_text_url()",
+                   /*expected_text=*/"Message https://example.com/",
+                   /*expected_title=*/"");
+  ConfirmShareText("share_file_url()",
+                   /*expected_text=*/"https://example.com/",
+                   /*expected_title=*/"");
+}
+
 }  // namespace webshare

chrome/browser/webshare/share_service_unittest.cc

@@ -131,8 +131,10 @@ class ShareServiceUnitTest : public ChromeRenderViewHostTestHarness {
 
 #if defined(OS_CHROMEOS)
   static void AcceptShareRequest(content::WebContents* web_contents,
-                                 std::vector<base::FilePath> file_paths,
-                                 std::vector<std::string> content_types,
+                                 const std::vector<base::FilePath>& file_paths,
+                                 const std::vector<std::string>& content_types,
+                                 const std::string& text,
+                                 const std::string& title,
                                  sharesheet::CloseCallback close_callback) {
     std::move(close_callback).Run(sharesheet::SharesheetResult::kSuccess);
   }

chrome/test/data/webshare/index.html

@@ -40,6 +40,61 @@
         return ('share failed: ' + error);
       }
     }
+
+    async function share_file_title() {
+      try {
+        const single_file = create_file('sample.webp', 'image/webp', 12);
+        await navigator.share({files: [single_file], title: "Subject"});
+        return 'share succeeded';
+      } catch(error) {
+        return ('share failed: ' + error);
+      }
+    }
+
+    async function share_file_title_url() {
+      try {
+        const single_file = create_file('sample.webp', 'image/webp', 12);
+        await navigator.share({files: [single_file],
+                               title: "Subject",
+                               url: "https://example.com/"});
+        return 'share succeeded';
+      } catch(error) {
+        return ('share failed: ' + error);
+      }
+    }
+
+    async function share_file_text() {
+      try {
+        const single_file = create_file('sample.webp', 'image/webp', 12);
+        await navigator.share({files: [single_file], text: "Message"});
+        return 'share succeeded';
+      } catch(error) {
+        return ('share failed: ' + error);
+      }
+    }
+
+    async function share_file_text_url() {
+      try {
+        const single_file = create_file('sample.webp', 'image/webp', 12);
+        await navigator.share({files: [single_file],
+                               text: "Message",
+                               url: "https://example.com/"});
+        return 'share succeeded';
+      } catch(error) {
+        return ('share failed: ' + error);
+      }
+    }
+
+    async function share_file_url() {
+      try {
+        const single_file = create_file('sample.webp', 'image/webp', 12);
+        await navigator.share({files: [single_file],
+                               url: "https://example.com/"});
+        return 'share succeeded';
+      } catch(error) {
+        return ('share failed: ' + error);
+      }
+    }
   </script>
 </head>
 <body>