| 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 2231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2242 &ssl_status.security_bits, | 2242 &ssl_status.security_bits, |
| 2243 &ssl_status.connection_status, | 2243 &ssl_status.connection_status, |
| 2244 &ssl_status.signed_certificate_timestamp_ids); | 2244 &ssl_status.signed_certificate_timestamp_ids); |
| 2245 return ssl_status; | 2245 return ssl_status; |
| 2246 } | 2246 } |
| 2247 | 2247 |
| 2248 const std::string& RenderViewImpl::GetAcceptLanguages() const { | 2248 const std::string& RenderViewImpl::GetAcceptLanguages() const { |
| 2249 return renderer_preferences_.accept_languages; | 2249 return renderer_preferences_.accept_languages; |
| 2250 } | 2250 } |
| 2251 | 2251 |
| 2252 void RenderViewImpl::AttachToBrowserPlugin(blink::WebNode& browser_plugin) { |
| 2253 GetBrowserPluginManager()->AttachToBrowserPlugin(browser_plugin); |
| 2254 } |
| 2255 |
| 2252 void RenderViewImpl::didCreateDataSource(WebLocalFrame* frame, | 2256 void RenderViewImpl::didCreateDataSource(WebLocalFrame* frame, |
| 2253 WebDataSource* ds) { | 2257 WebDataSource* ds) { |
| 2254 bool content_initiated = !pending_navigation_params_.get(); | 2258 bool content_initiated = !pending_navigation_params_.get(); |
| 2255 | 2259 |
| 2256 // Make sure any previous redirect URLs end up in our new data source. | 2260 // Make sure any previous redirect URLs end up in our new data source. |
| 2257 if (pending_navigation_params_.get()) { | 2261 if (pending_navigation_params_.get()) { |
| 2258 for (std::vector<GURL>::const_iterator i = | 2262 for (std::vector<GURL>::const_iterator i = |
| 2259 pending_navigation_params_->redirects.begin(); | 2263 pending_navigation_params_->redirects.begin(); |
| 2260 i != pending_navigation_params_->redirects.end(); ++i) { | 2264 i != pending_navigation_params_->redirects.end(); ++i) { |
| 2261 ds->appendRedirect(*i); | 2265 ds->appendRedirect(*i); |
| (...skipping 2030 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4292 std::vector<gfx::Size> sizes; | 4296 std::vector<gfx::Size> sizes; |
| 4293 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4297 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4294 if (!url.isEmpty()) | 4298 if (!url.isEmpty()) |
| 4295 urls.push_back( | 4299 urls.push_back( |
| 4296 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4300 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4297 } | 4301 } |
| 4298 SendUpdateFaviconURL(urls); | 4302 SendUpdateFaviconURL(urls); |
| 4299 } | 4303 } |
| 4300 | 4304 |
| 4301 } // namespace content | 4305 } // namespace content |
| OLD | NEW |