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

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

Issue 2064943002: Pass in extra parameters to WebApkBuilder#buildWebApkAsync() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into webapk_manifest000 Created 4 years, 6 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/browser/manifest/manifest_manager_host.h ('k') | 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 e6c70b5f87708eef81e962dc3b4415679a82377e..112c3344c7a49bac205b83d508138fb1036bf652 100644
--- a/content/browser/manifest/manifest_manager_host.cc
+++ b/content/browser/manifest/manifest_manager_host.cc
@@ -65,7 +65,7 @@ void ManifestManagerHost::RenderFrameDeleted(
{
GetCallbackMap::const_iterator it(callbacks);
for (; !it.IsAtEnd(); it.Advance())
- it.GetCurrentValue()->Run(Manifest());
+ it.GetCurrentValue()->Run(GURL(), Manifest());
}
delete callbacks;
@@ -137,6 +137,7 @@ bool ManifestManagerHost::OnMessageReceived(
void ManifestManagerHost::OnRequestManifestResponse(
RenderFrameHost* render_frame_host,
int request_id,
+ const GURL& manifest_url,
const Manifest& insecure_manifest) {
GetCallbackMap* callbacks = GetCallbackMapForFrame(render_frame_host);
if (!callbacks) {
@@ -194,7 +195,7 @@ void ManifestManagerHost::OnRequestManifestResponse(
manifest.background_color > std::numeric_limits<int32_t>::max())
manifest.background_color = Manifest::kInvalidOrMissingColor;
- callback->Run(manifest);
+ callback->Run(manifest_url, manifest);
callbacks->Remove(request_id);
if (callbacks->IsEmpty()) {
delete callbacks;
« no previous file with comments | « content/browser/manifest/manifest_manager_host.h ('k') | content/common/manifest_manager_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698