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

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

Issue 590563002: Add support for icons.{src,type,density} in Manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EXPORT Manifest::Icon Created 6 years, 3 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 796d0a969379322babb810446cda4ce1a7567006..ebab903d0956d3a04b2b0ba3cbaaba56dc103c60 100644
--- a/content/browser/manifest/manifest_manager_host.cc
+++ b/content/browser/manifest/manifest_manager_host.cc
@@ -109,8 +109,16 @@ void ManifestManagerHost::OnRequestManifestResponse(
manifest.short_name = base::NullableString16(
manifest.short_name.string().substr(0, Manifest::kMaxIPCStringLength),
manifest.short_name.is_null());
- if (!manifest.start_url.is_empty() && !manifest.start_url.is_valid())
+ 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());
+ }
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