Index: chrome/browser/extensions/bookmark_app_helper.cc |
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc |
index a70c1b294760af858479e5a0fa4d389438adb6c1..f9885fe9afa4ee499929878c5fa230851a6bb027 100644 |
--- a/chrome/browser/extensions/bookmark_app_helper.cc |
+++ b/chrome/browser/extensions/bookmark_app_helper.cc |
@@ -28,8 +28,10 @@ |
#include "chrome/browser/ui/browser_finder.h" |
#include "chrome/browser/ui/browser_window.h" |
#include "chrome/browser/web_applications/web_app.h" |
+#include "chrome/browser/webshare/share_target_pref_helper.h" |
#include "chrome/common/extensions/extension_constants.h" |
#include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
+#include "chrome/common/origin_trials/chrome_origin_trial_policy.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/grit/platform_locale_settings.h" |
#include "components/prefs/pref_service.h" |
@@ -583,6 +585,20 @@ void BookmarkAppHelper::OnDidGetManifest(const GURL& manifest_url, |
UpdateWebAppInfoFromManifest(manifest, &web_app_info_); |
+ if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) { |
+ std::string manifest_url_string = manifest_url.spec(); |
Matt Giuca
2017/01/25 00:25:53
This can be a const std::string& (since GURL::spec
constantina
2017/01/25 03:18:27
Done.
|
+ |
+ base::Optional<std::string> url_template; |
+ if (manifest.share_target.has_value() && |
+ !manifest.share_target.value().url_template.is_null()) { |
+ url_template = base::Optional<std::string>(base::UTF16ToUTF8( |
+ manifest.share_target.value().url_template.string())); |
+ } |
+ |
+ AddShareTargetToPrefs(manifest_url_string, std::move(url_template), |
+ profile_->GetPrefs()); |
+ } |
+ |
// Add urls from the WebApplicationInfo. |
std::vector<GURL> web_app_info_icon_urls; |
for (std::vector<WebApplicationInfo::IconInfo>::const_iterator it = |