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

Unified Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 19798012: Remove security_origin member from content::Stream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 9e5c8ebc7c90c7f630f7b251fb541fe01426e9e5..556eb26bebb0a9840a2e6ca359d94fbe3e39f8f9 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -499,7 +499,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
content::ResourceContext* resource_context,
const GURL& url,
const std::string& mime_type,
- GURL* security_origin,
+ GURL* origin,
std::string* target_id) {
#if !defined(OS_ANDROID)
ProfileIOData* io_data =
@@ -523,7 +523,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
}
if (ExtensionCanHandleMimeType(extension, mime_type)) {
- *security_origin = Extension::GetBaseURLFromExtensionId(extension_id);
+ *origin = Extension::GetBaseURLFromExtensionId(extension_id);
*target_id = extension_id;
return true;
}

Powered by Google App Engine
This is Rietveld 408576698