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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 88643002: SignedCertificateTimestamp storing & serialization code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@erans_patches
Patch Set: remove a spurious content:: Created 7 years 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
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 3190 matching lines...) Expand 10 before | Expand all | Expand 10 after
3201 SSLStatus RenderViewImpl::GetSSLStatusOfFrame(blink::WebFrame* frame) const { 3201 SSLStatus RenderViewImpl::GetSSLStatusOfFrame(blink::WebFrame* frame) const {
3202 std::string security_info; 3202 std::string security_info;
3203 if (frame && frame->dataSource()) 3203 if (frame && frame->dataSource())
3204 security_info = frame->dataSource()->response().securityInfo(); 3204 security_info = frame->dataSource()->response().securityInfo();
3205 3205
3206 SSLStatus ssl_status; 3206 SSLStatus ssl_status;
3207 DeserializeSecurityInfo(security_info, 3207 DeserializeSecurityInfo(security_info,
3208 &ssl_status.cert_id, 3208 &ssl_status.cert_id,
3209 &ssl_status.cert_status, 3209 &ssl_status.cert_status,
3210 &ssl_status.security_bits, 3210 &ssl_status.security_bits,
3211 &ssl_status.connection_status); 3211 &ssl_status.connection_status,
3212 &ssl_status.signed_certificate_timestamp_ids);
3212 return ssl_status; 3213 return ssl_status;
3213 } 3214 }
3214 3215
3215 const std::string& RenderViewImpl::GetAcceptLanguages() const { 3216 const std::string& RenderViewImpl::GetAcceptLanguages() const {
3216 return renderer_preferences_.accept_languages; 3217 return renderer_preferences_.accept_languages;
3217 } 3218 }
3218 3219
3219 WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( 3220 WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
3220 WebFrame* frame, WebDataSource::ExtraData* extraData, 3221 WebFrame* frame, WebDataSource::ExtraData* extraData,
3221 const WebURLRequest& request, WebNavigationType type, 3222 const WebURLRequest& request, WebNavigationType type,
(...skipping 3457 matching lines...) Expand 10 before | Expand all | Expand 10 after
6679 for (size_t i = 0; i < icon_urls.size(); i++) { 6680 for (size_t i = 0; i < icon_urls.size(); i++) {
6680 WebURL url = icon_urls[i].iconURL(); 6681 WebURL url = icon_urls[i].iconURL();
6681 if (!url.isEmpty()) 6682 if (!url.isEmpty())
6682 urls.push_back(FaviconURL(url, 6683 urls.push_back(FaviconURL(url,
6683 ToFaviconType(icon_urls[i].iconType()))); 6684 ToFaviconType(icon_urls[i].iconType())));
6684 } 6685 }
6685 SendUpdateFaviconURL(urls); 6686 SendUpdateFaviconURL(urls);
6686 } 6687 }
6687 6688
6688 } // namespace content 6689 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698