Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4083)

Unified Diff: chrome/browser/webshare/share_service_impl.cc

Issue 2644793006: Add picker view for Web Share Target. (Closed)
Patch Set: Fix unit tests and add cancellation test (adds virtual method to Impl class). Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/webshare/share_service_impl.cc
diff --git a/chrome/browser/webshare/share_service_impl.cc b/chrome/browser/webshare/share_service_impl.cc
index 6b12400c3c504f60efbcd012ffb45f0dcde34ba0..b4b18253052c726fedd25c51abf484bb4661f5d5 100644
--- a/chrome/browser/webshare/share_service_impl.cc
+++ b/chrome/browser/webshare/share_service_impl.cc
@@ -9,6 +9,7 @@
#include <utility>
#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_list.h"
@@ -111,6 +112,14 @@ bool ShareServiceImpl::ReplacePlaceholders(base::StringPiece url_template,
return true;
}
+void ShareServiceImpl::ShowPickerDialog(
+ const std::vector<base::string16>& targets,
+ const base::Callback<void(chrome::SharePickerResult)>& callback) {
+ // TODO(mgiuca): Get the browser window as |parent_window|.
+ chrome::ShowWebShareTargetPickerDialog(nullptr /* parent_window */, targets,
+ callback);
+}
+
void ShareServiceImpl::OpenTargetURL(const GURL& target_url) {
// TODO(constantina): Prevent this code from being run/compiled in android.
#if defined(OS_LINUX) || defined(OS_WIN)
@@ -124,6 +133,25 @@ void ShareServiceImpl::Share(const std::string& title,
const std::string& text,
const GURL& share_url,
const ShareCallback& callback) {
+ // TODO(constantina): Replace hard-coded name with the registered target list.
+ constexpr char kTargetName[] = "Web Share Target Test App";
+ std::vector<base::string16> targets{base::ASCIIToUTF16(kTargetName)};
+
+ ShowPickerDialog(targets, base::Bind(&ShareServiceImpl::OnPickerClosed,
+ base::Unretained(this), title, text,
+ share_url, callback));
+}
+
+void ShareServiceImpl::OnPickerClosed(const std::string& title,
+ const std::string& text,
+ const GURL& share_url,
+ const ShareCallback& callback,
+ chrome::SharePickerResult result) {
+ if (result == chrome::SharePickerResult::CANCEL) {
+ callback.Run(base::Optional<std::string>("Share was cancelled"));
+ return;
+ }
+
// TODO(constantina): replace hard-coded URL with one from user-chosen site.
constexpr char kUrlBase[] = "https://wicg.github.io/web-share-target/";
constexpr char kUrlTemplate[] =

Powered by Google App Engine
This is Rietveld 408576698