Index: chrome/browser/webshare/share_service_impl.h |
diff --git a/chrome/browser/webshare/share_service_impl.h b/chrome/browser/webshare/share_service_impl.h |
index 83de10f9511ff36394283b8f200f331ae0dad769..19ad481c8448f212ee9afe476a39e54eb08b4740 100644 |
--- a/chrome/browser/webshare/share_service_impl.h |
+++ b/chrome/browser/webshare/share_service_impl.h |
@@ -7,6 +7,7 @@ |
#include <string> |
+#include "base/gtest_prod_util.h" |
#include "mojo/public/cpp/bindings/interface_request.h" |
#include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" |
@@ -20,12 +21,35 @@ class ShareServiceImpl : public blink::mojom::ShareService { |
static void Create(mojo::InterfaceRequest<ShareService> request); |
+ // blink::mojom::ShareService overrides: |
void Share(const std::string& title, |
const std::string& text, |
- const GURL& url, |
+ const GURL& share_url, |
const ShareCallback& callback) override; |
+ protected: |
+ // Opens a new tab and navigates to |target_url|. |
+ // Virtual for testing purposes. |
+ virtual void OpenTargetURL(const GURL& target_url); |
Sam McNally
2017/01/04 09:15:46
This doesn't need to be protected to override it.
constantina
2017/01/05 00:34:38
Matt said to make it protected, but private makes
Matt Giuca
2017/01/05 03:09:25
Acknowledged.
|
+ |
private: |
+ FRIEND_TEST_ALL_PREFIXES(ShareServiceImplUnittest, ReplacePlaceholders); |
+ FRIEND_TEST_ALL_PREFIXES(ShareServiceImplUnittest, |
Sam McNally
2017/01/04 09:15:46
Remove.
constantina
2017/01/05 00:34:38
Done.
|
+ ReplacePlaceholdersInQuery); |
+ |
+ // Replaces all instances of "%{title}", "%{text}", and "%{url}" (quotes for |
+ // clarity) in |url_template| with |title|, |text|, and |url| respectively. |
+ // Replaces instances of "%{other}" where other is any string besides title, |
+ // text, and url, with and empty string, for backwards compatibility. |
+ // Sets *error to 1, and returns the untouched "url_template|, if there are |
+ // badly nested placeholders. This includes any case in which two "%{" occur |
+ // before a "}", or a "}" occurs with no preceding "%{", |
+ static std::string ReplacePlaceholders(const std::string url_template, |
Sam McNally
2017/01/04 09:15:46
Take base::StringPiece unless you need pass it to
constantina
2017/01/05 00:34:38
Done.
|
+ const std::string title, |
+ const std::string text, |
+ const GURL& share_url, |
+ int* error); |
Sam McNally
2017/01/04 09:15:46
It's more common for the error code/bool to be ret
constantina
2017/01/05 00:34:38
Done.
|
+ |
DISALLOW_COPY_AND_ASSIGN(ShareServiceImpl); |
}; |