| 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 2244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2255 } | 2255 } |
| 2256 | 2256 |
| 2257 RenderFrame* RenderViewImpl::GetMainRenderFrame() { | 2257 RenderFrame* RenderViewImpl::GetMainRenderFrame() { |
| 2258 return main_render_frame_.get(); | 2258 return main_render_frame_.get(); |
| 2259 } | 2259 } |
| 2260 | 2260 |
| 2261 int RenderViewImpl::GetRoutingID() const { | 2261 int RenderViewImpl::GetRoutingID() const { |
| 2262 return routing_id_; | 2262 return routing_id_; |
| 2263 } | 2263 } |
| 2264 | 2264 |
| 2265 int RenderViewImpl::GetPageId() const { | |
| 2266 return page_id_; | |
| 2267 } | |
| 2268 | |
| 2269 gfx::Size RenderViewImpl::GetSize() const { | 2265 gfx::Size RenderViewImpl::GetSize() const { |
| 2270 return size(); | 2266 return size(); |
| 2271 } | 2267 } |
| 2272 | 2268 |
| 2273 WebPreferences& RenderViewImpl::GetWebkitPreferences() { | 2269 WebPreferences& RenderViewImpl::GetWebkitPreferences() { |
| 2274 return webkit_preferences_; | 2270 return webkit_preferences_; |
| 2275 } | 2271 } |
| 2276 | 2272 |
| 2277 void RenderViewImpl::SetWebkitPreferences(const WebPreferences& preferences) { | 2273 void RenderViewImpl::SetWebkitPreferences(const WebPreferences& preferences) { |
| 2278 OnUpdateWebPreferences(preferences); | 2274 OnUpdateWebPreferences(preferences); |
| (...skipping 1703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3982 std::vector<gfx::Size> sizes; | 3978 std::vector<gfx::Size> sizes; |
| 3983 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3979 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3984 if (!url.isEmpty()) | 3980 if (!url.isEmpty()) |
| 3985 urls.push_back( | 3981 urls.push_back( |
| 3986 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3982 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3987 } | 3983 } |
| 3988 SendUpdateFaviconURL(urls); | 3984 SendUpdateFaviconURL(urls); |
| 3989 } | 3985 } |
| 3990 | 3986 |
| 3991 } // namespace content | 3987 } // namespace content |
| OLD | NEW |