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

Unified Diff: webkit/glue/resource_loader_bridge.h

Issue 46094: Fix our handling of mixed SSL / non-SSL content.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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: webkit/glue/resource_loader_bridge.h
===================================================================
--- webkit/glue/resource_loader_bridge.h (revision 11701)
+++ webkit/glue/resource_loader_bridge.h (working copy)
@@ -152,9 +152,6 @@
//
// load_flags is composed of the values defined in url_request_load_flags.h
//
- // mixed_content when true indicates that the resource associated with this
- // request is over HTTP when the main page was loaded over HTTPS.
- //
// request_type indicates if the current request is the main frame load, a
// sub-frame load, or a sub objects load.
static ResourceLoaderBridge* Create(WebFrame* frame,
@@ -162,11 +159,12 @@
const GURL& url,
const GURL& policy_url,
const GURL& referrer,
+ const std::string& frame_origin,
+ const std::string& main_frame_origin,
const std::string& headers,
int load_flags,
int origin_pid,
- ResourceType::Type request_type,
- bool mixed_content);
+ ResourceType::Type request_type);
// Call this method before calling Start() to append a chunk of binary data
// to the request body. May only be used with HTTP(S) POST requests.

Powered by Google App Engine
This is Rietveld 408576698