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

Side by Side Diff: content/renderer/render_view_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/renderer/context_menu_params_builder.cc ('k') | net/cert/cert_status_flags.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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3175 matching lines...) Expand 10 before | Expand all | Expand 10 after
3186 SSLStatus RenderViewImpl::GetSSLStatusOfFrame(blink::WebFrame* frame) const { 3186 SSLStatus RenderViewImpl::GetSSLStatusOfFrame(blink::WebFrame* frame) const {
3187 std::string security_info; 3187 std::string security_info;
3188 if (frame && frame->dataSource()) 3188 if (frame && frame->dataSource())
3189 security_info = frame->dataSource()->response().securityInfo(); 3189 security_info = frame->dataSource()->response().securityInfo();
3190 3190
3191 SSLStatus ssl_status; 3191 SSLStatus ssl_status;
3192 DeserializeSecurityInfo(security_info, 3192 DeserializeSecurityInfo(security_info,
3193 &ssl_status.cert_id, 3193 &ssl_status.cert_id,
3194 &ssl_status.cert_status, 3194 &ssl_status.cert_status,
3195 &ssl_status.security_bits, 3195 &ssl_status.security_bits,
3196 &ssl_status.connection_status); 3196 &ssl_status.connection_status,
3197 &ssl_status.signed_certificate_timestamp_id);
3197 return ssl_status; 3198 return ssl_status;
3198 } 3199 }
3199 3200
3200 const std::string& RenderViewImpl::GetAcceptLanguages() const { 3201 const std::string& RenderViewImpl::GetAcceptLanguages() const {
3201 return renderer_preferences_.accept_languages; 3202 return renderer_preferences_.accept_languages;
3202 } 3203 }
3203 3204
3204 WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( 3205 WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
3205 WebFrame* frame, WebDataSource::ExtraData* extraData, 3206 WebFrame* frame, WebDataSource::ExtraData* extraData,
3206 const WebURLRequest& request, WebNavigationType type, 3207 const WebURLRequest& request, WebNavigationType type,
(...skipping 3452 matching lines...) Expand 10 before | Expand all | Expand 10 after
6659 for (size_t i = 0; i < icon_urls.size(); i++) { 6660 for (size_t i = 0; i < icon_urls.size(); i++) {
6660 WebURL url = icon_urls[i].iconURL(); 6661 WebURL url = icon_urls[i].iconURL();
6661 if (!url.isEmpty()) 6662 if (!url.isEmpty())
6662 urls.push_back(FaviconURL(url, 6663 urls.push_back(FaviconURL(url,
6663 ToFaviconType(icon_urls[i].iconType()))); 6664 ToFaviconType(icon_urls[i].iconType())));
6664 } 6665 }
6665 SendUpdateFaviconURL(urls); 6666 SendUpdateFaviconURL(urls);
6666 } 6667 }
6667 6668
6668 } // namespace content 6669 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/context_menu_params_builder.cc ('k') | net/cert/cert_status_flags.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698