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

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

Issue 577673004: Add support for 'start_url' in Manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@manifest_manager_content
Patch Set: oups 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 | « content/renderer/manifest/manifest_manager.h ('k') | content/renderer/manifest/manifest_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/manifest/manifest_manager.cc
diff --git a/content/renderer/manifest/manifest_manager.cc b/content/renderer/manifest/manifest_manager.cc
index ae702b3fc3a51677a6249c0ab6b80b34de9f85fa..88ef6ac499269e12dcf5018265b0cd6991b57126 100644
--- a/content/renderer/manifest/manifest_manager.cc
+++ b/content/renderer/manifest/manifest_manager.cc
@@ -103,10 +103,12 @@ void ManifestManager::FetchManifest() {
// CSP rule, see http://crbug.com/409996.
fetcher_->Start(render_frame()->GetWebFrame(),
base::Bind(&ManifestManager::OnManifestFetchComplete,
- base::Unretained(this)));
+ base::Unretained(this),
+ render_frame()->GetWebFrame()->document().url()));
}
void ManifestManager::OnManifestFetchComplete(
+ const GURL& document_url,
const blink::WebURLResponse& response,
const std::string& data) {
if (response.isNull() && data.empty()) {
@@ -114,7 +116,7 @@ void ManifestManager::OnManifestFetchComplete(
return;
}
- manifest_ = ManifestParser::Parse(data);
+ manifest_ = ManifestParser::Parse(data, response.url(), document_url);
fetcher_.reset();
ResolveCallbacks(ResolveStateSuccess);
« no previous file with comments | « content/renderer/manifest/manifest_manager.h ('k') | content/renderer/manifest/manifest_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698