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

Unified Diff: content/browser/manifest/manifest_manager_host.cc

Issue 919293002: Add related_applications field to manifest parser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback Created 5 years, 8 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 | « no previous file | content/common/manifest_manager_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/manifest/manifest_manager_host.cc
diff --git a/content/browser/manifest/manifest_manager_host.cc b/content/browser/manifest/manifest_manager_host.cc
index 14d07e203ee3a9b69274bfd67ca661a4a5cf10e0..c22ae0ad46acfd1a4fd4c91c958e3325b55ce4e9 100644
--- a/content/browser/manifest/manifest_manager_host.cc
+++ b/content/browser/manifest/manifest_manager_host.cc
@@ -117,18 +117,25 @@ void ManifestManagerHost::OnRequestManifestResponse(
manifest.short_name.is_null());
if (!manifest.start_url.is_valid())
manifest.start_url = GURL();
- for (size_t i = 0; i < manifest.icons.size(); ++i) {
- if (!manifest.icons[i].src.is_valid())
- manifest.icons[i].src = GURL();
- manifest.icons[i].type = base::NullableString16(
- manifest.icons[i].type.string().substr(0,
- Manifest::kMaxIPCStringLength),
- manifest.icons[i].type.is_null());
+ for (auto& icon : manifest.icons) {
+ if (!icon.src.is_valid())
+ icon.src = GURL();
+ icon.type = base::NullableString16(
+ icon.type.string().substr(0, Manifest::kMaxIPCStringLength),
+ icon.type.is_null());
}
manifest.gcm_sender_id = base::NullableString16(
manifest.gcm_sender_id.string().substr(
0, Manifest::kMaxIPCStringLength),
manifest.gcm_sender_id.is_null());
+ for (auto& related_application : manifest.related_applications) {
+ if (!related_application.url.is_valid())
+ related_application.url = GURL();
+ related_application.id =
+ base::NullableString16(related_application.id.string().substr(
+ 0, Manifest::kMaxIPCStringLength),
+ related_application.id.is_null());
+ }
callback->Run(manifest);
callbacks->Remove(request_id);
« no previous file with comments | « no previous file | content/common/manifest_manager_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698