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

Unified Diff: chrome/browser/tab_contents/web_contents.cc

Issue 42263: SSL Fix: Step 4.... (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
« no previous file with comments | « chrome/browser/tab_contents/web_contents.h ('k') | chrome/common/render_messages_internal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/web_contents.cc
===================================================================
--- chrome/browser/tab_contents/web_contents.cc (revision 11701)
+++ chrome/browser/tab_contents/web_contents.cc (working copy)
@@ -926,6 +926,8 @@
void WebContents::DidLoadResourceFromMemoryCache(
const GURL& url,
+ const std::string& frame_origin,
+ const std::string& main_frame_origin,
const std::string& security_info) {
if (!controller())
return;
@@ -935,7 +937,8 @@
SSLManager::DeserializeSecurityInfo(security_info,
&cert_id, &cert_status,
&security_bits);
- LoadFromMemoryCacheDetails details(url, cert_id, cert_status);
+ LoadFromMemoryCacheDetails details(url, frame_origin, main_frame_origin,
+ cert_id, cert_status);
NotificationService::current()->Notify(
NotificationType::LOAD_FROM_MEMORY_CACHE,
« no previous file with comments | « chrome/browser/tab_contents/web_contents.h ('k') | chrome/common/render_messages_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698