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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/render_view.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
« chrome/browser/ssl/ssl_policy.cc ('K') | « chrome/plugin/chrome_plugin_host.cc ('k') | chrome/renderer/render_view.cc » ('j') | net/base/x509_certificate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.h
===================================================================
--- chrome/renderer/render_view.h (revision 11701)
+++ chrome/renderer/render_view.h (working copy)
@@ -193,10 +193,13 @@
const WebError& error,
WebFrame* forFrame);
virtual void DidFinishDocumentLoadForFrame(WebView* webview, WebFrame* frame);
- virtual bool DidLoadResourceFromMemoryCache(WebView* webview,
- const WebRequest& request,
- const WebResponse& response,
- WebFrame* frame);
+ virtual bool DidLoadResourceFromMemoryCache(
+ WebView* webview,
+ const WebRequest& request,
+ const WebResponse& response,
+ WebFrame* frame,
+ const std::string& frame_origin,
+ const std::string& main_frame_origin);
virtual void DidHandleOnloadEventsForFrame(WebView* webview, WebFrame* frame);
virtual void DidChangeLocationWithinPageForFrame(WebView* webview,
WebFrame* frame,
« chrome/browser/ssl/ssl_policy.cc ('K') | « chrome/plugin/chrome_plugin_host.cc ('k') | chrome/renderer/render_view.cc » ('j') | net/base/x509_certificate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698