| OLD | NEW |
| 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 3194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3205 SSLStatus RenderViewImpl::GetSSLStatusOfFrame(blink::WebFrame* frame) const { | 3205 SSLStatus RenderViewImpl::GetSSLStatusOfFrame(blink::WebFrame* frame) const { |
| 3206 std::string security_info; | 3206 std::string security_info; |
| 3207 if (frame && frame->dataSource()) | 3207 if (frame && frame->dataSource()) |
| 3208 security_info = frame->dataSource()->response().securityInfo(); | 3208 security_info = frame->dataSource()->response().securityInfo(); |
| 3209 | 3209 |
| 3210 SSLStatus ssl_status; | 3210 SSLStatus ssl_status; |
| 3211 DeserializeSecurityInfo(security_info, | 3211 DeserializeSecurityInfo(security_info, |
| 3212 &ssl_status.cert_id, | 3212 &ssl_status.cert_id, |
| 3213 &ssl_status.cert_status, | 3213 &ssl_status.cert_status, |
| 3214 &ssl_status.security_bits, | 3214 &ssl_status.security_bits, |
| 3215 &ssl_status.connection_status); | 3215 &ssl_status.connection_status, |
| 3216 &ssl_status.signed_certificate_timestamp_ids); |
| 3216 return ssl_status; | 3217 return ssl_status; |
| 3217 } | 3218 } |
| 3218 | 3219 |
| 3219 const std::string& RenderViewImpl::GetAcceptLanguages() const { | 3220 const std::string& RenderViewImpl::GetAcceptLanguages() const { |
| 3220 return renderer_preferences_.accept_languages; | 3221 return renderer_preferences_.accept_languages; |
| 3221 } | 3222 } |
| 3222 | 3223 |
| 3223 WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( | 3224 WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation( |
| 3224 WebFrame* frame, WebDataSource::ExtraData* extraData, | 3225 WebFrame* frame, WebDataSource::ExtraData* extraData, |
| 3225 const WebURLRequest& request, WebNavigationType type, | 3226 const WebURLRequest& request, WebNavigationType type, |
| (...skipping 3457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6683 for (size_t i = 0; i < icon_urls.size(); i++) { | 6684 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6684 WebURL url = icon_urls[i].iconURL(); | 6685 WebURL url = icon_urls[i].iconURL(); |
| 6685 if (!url.isEmpty()) | 6686 if (!url.isEmpty()) |
| 6686 urls.push_back(FaviconURL(url, | 6687 urls.push_back(FaviconURL(url, |
| 6687 ToFaviconType(icon_urls[i].iconType()))); | 6688 ToFaviconType(icon_urls[i].iconType()))); |
| 6688 } | 6689 } |
| 6689 SendUpdateFaviconURL(urls); | 6690 SendUpdateFaviconURL(urls); |
| 6690 } | 6691 } |
| 6691 | 6692 |
| 6692 } // namespace content | 6693 } // namespace content |
| OLD | NEW |