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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 27026002: CT: Adding preliminary Certificate Transparency support to Chromium. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Distinguish between SCTs from unknown logs and unverified ones Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/ssl/ssl_manager.cc ('k') | content/common/ssl_status_serialization.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 2116 matching lines...) Expand 10 before | Expand all | Expand 10 after
2127 const std::string& mime_type, 2127 const std::string& mime_type,
2128 ResourceType::Type resource_type) { 2128 ResourceType::Type resource_type) {
2129 base::StatsCounter cache("WebKit.CacheHit"); 2129 base::StatsCounter cache("WebKit.CacheHit");
2130 cache.Increment(); 2130 cache.Increment();
2131 2131
2132 // Send out a notification that we loaded a resource from our memory cache. 2132 // Send out a notification that we loaded a resource from our memory cache.
2133 int cert_id = 0; 2133 int cert_id = 0;
2134 net::CertStatus cert_status = 0; 2134 net::CertStatus cert_status = 0;
2135 int security_bits = -1; 2135 int security_bits = -1;
2136 int connection_status = 0; 2136 int connection_status = 0;
2137 int signed_certificate_timestamp_id = 0;
2137 DeserializeSecurityInfo(security_info, &cert_id, &cert_status, 2138 DeserializeSecurityInfo(security_info, &cert_id, &cert_status,
2138 &security_bits, &connection_status); 2139 &security_bits, &connection_status,
2140 &signed_certificate_timestamp_id);
2141 // XXX(rsleevi): Track the SCT here
2139 LoadFromMemoryCacheDetails details( 2142 LoadFromMemoryCacheDetails details(
2140 url, GetRenderProcessHost()->GetID(), cert_id, cert_status, http_method, 2143 url, GetRenderProcessHost()->GetID(), cert_id, cert_status, http_method,
2141 mime_type, resource_type); 2144 mime_type, resource_type);
2142 2145
2143 controller_.ssl_manager()->DidLoadFromMemoryCache(details); 2146 controller_.ssl_manager()->DidLoadFromMemoryCache(details);
2144 2147
2145 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2148 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
2146 DidLoadResourceFromMemoryCache(details)); 2149 DidLoadResourceFromMemoryCache(details));
2147 2150
2148 if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) { 2151 if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
(...skipping 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after
3670 } 3673 }
3671 3674
3672 void WebContentsImpl::OnFrameRemoved( 3675 void WebContentsImpl::OnFrameRemoved(
3673 RenderViewHostImpl* render_view_host, 3676 RenderViewHostImpl* render_view_host,
3674 int64 frame_id) { 3677 int64 frame_id) {
3675 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 3678 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3676 FrameDetached(render_view_host, frame_id)); 3679 FrameDetached(render_view_host, frame_id));
3677 } 3680 }
3678 3681
3679 } // namespace content 3682 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/ssl/ssl_manager.cc ('k') | content/common/ssl_status_serialization.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698