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

Unified Diff: content/renderer/manifest/manifest_parser.cc

Issue 2637003002: Add share_target field to Manifest. (Closed)
Patch Set: Changed share_target type to base::Optional, and fixed tests, according to feedback. 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
« no previous file with comments | « content/renderer/manifest/manifest_parser.h ('k') | content/renderer/manifest/manifest_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/manifest/manifest_parser.cc
diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc
index 93e596992567517a587041776e7dd692d59af6c4..4d3f7f79622c4204814c615ed20ada713399f1db 100644
--- a/content/renderer/manifest/manifest_parser.cc
+++ b/content/renderer/manifest/manifest_parser.cc
@@ -69,6 +69,7 @@ void ManifestParser::Parse() {
manifest_.display = ParseDisplay(*dictionary);
manifest_.orientation = ParseOrientation(*dictionary);
manifest_.icons = ParseIcons(*dictionary);
+ manifest_.share_target = ParseShareTarget(*dictionary);
manifest_.related_applications = ParseRelatedApplications(*dictionary);
manifest_.prefer_related_applications =
ParsePreferRelatedApplications(*dictionary);
@@ -340,6 +341,27 @@ std::vector<Manifest::Icon> ManifestParser::ParseIcons(
return icons;
}
+base::NullableString16 ManifestParser::ParseShareTargetURLTemplate(
+ const base::DictionaryValue& share_target) {
+ return ParseString(share_target, "url_template", Trim);
+}
+
+base::Optional<Manifest::ShareTarget> ManifestParser::ParseShareTarget(
+ const base::DictionaryValue& dictionary) {
+ if (!dictionary.HasKey("share_target"))
+ return base::nullopt;
+
+ Manifest::ShareTarget share_target;
+ const base::DictionaryValue* share_target_dict = nullptr;
+ dictionary.GetDictionary("share_target", &share_target_dict);
+ share_target.url_template = ParseShareTargetURLTemplate(*share_target_dict);
+
+ if (share_target.url_template.is_null()) {
+ return base::nullopt;
+ }
+ return base::Optional<Manifest::ShareTarget>(share_target);
+}
+
base::NullableString16 ManifestParser::ParseRelatedApplicationPlatform(
const base::DictionaryValue& application) {
return ParseString(application, "platform", Trim);
« no previous file with comments | « content/renderer/manifest/manifest_parser.h ('k') | content/renderer/manifest/manifest_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698