Add a pref name for share targets, and store their manifest data.

chrome/browser/extensions/bookmark_app_helper.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 
 #include <stddef.h>
 
 #include <cctype>
 #include <string>
@@ skipping 10 matching lines @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/favicon_downloader.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #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"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/image_loader.h"
@@ skipping 533 matching lines @@
   OnDidGetManifest(GURL(), manifest);
 }
 
 void BookmarkAppHelper::OnDidGetManifest(const GURL& manifest_url,
                                          const content::Manifest& manifest) {
   if (contents_->IsBeingDestroyed())
     return;
 
   UpdateWebAppInfoFromManifest(manifest, &web_app_info_);
 
+  if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
+    std::string manifest_url_spec = manifest_url.spec();
+    base::StringPiece share_target(

[Matt Giuca, 2017/01/24 03:26:09]

This is a confusing name since it's the manifest URL, not the share target.

[constantina, 2017/01/24 23:39:04]

Done.

+        manifest_url_spec.data(),
+        manifest_url_spec.size() - manifest_url.ExtractFileName().size());

[Matt Giuca, 2017/01/24 03:26:09]

This is getting the path to the directory the manifest is in? But chopping off
its filename?

Why chop off the filename? There could be two manifests in the same directory.
We should use the full URL including the filename as the key.

[constantina, 2017/01/24 23:39:04]

My bad, I misinterpretted manifest URL, as this. Changed all instances.

+
+    base::Optional<std::string> url_template = base::nullopt;

[Matt Giuca, 2017/01/24 03:26:09]

I don't think you need "= base::nullopt" (default constructor should be this).

[constantina, 2017/01/24 23:39:04]

Done.

+    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()));
+    }
+
+    webshare::AddShareTargetToPrefs(share_target, url_template,

[Matt Giuca, 2017/01/24 03:26:09]

std::move(url_template) to avoid copying.

[constantina, 2017/01/24 23:39:04]

Done.

+                                    profile_->GetPrefs());
+  }
+
   // Add urls from the WebApplicationInfo.
   std::vector<GURL> web_app_info_icon_urls;
   for (std::vector<WebApplicationInfo::IconInfo>::const_iterator it =
            web_app_info_.icons.begin();
        it != web_app_info_.icons.end();
        ++it) {
     if (it->url.is_valid())
       web_app_info_icon_urls.push_back(it->url);
   }
 
@@ skipping 212 matching lines @@
       extension, info_list, base::Bind(&OnIconsLoaded, web_app_info, callback));
 }
 
 bool IsValidBookmarkAppUrl(const GURL& url) {
   URLPattern origin_only_pattern(Extension::kValidBookmarkAppSchemes);
   origin_only_pattern.SetMatchAllURLs(true);
   return url.is_valid() && origin_only_pattern.MatchesURL(url);
 }
 
 }  // namespace extensions