| 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 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1404 params.referrer = GetReferrerFromRequest(creator, request); | 1404 params.referrer = GetReferrerFromRequest(creator, request); |
| 1405 } | 1405 } |
| 1406 params.features = features; | 1406 params.features = features; |
| 1407 | 1407 |
| 1408 for (size_t i = 0; i < features.additionalFeatures.size(); ++i) | 1408 for (size_t i = 0; i < features.additionalFeatures.size(); ++i) |
| 1409 params.additional_features.push_back(features.additionalFeatures[i]); | 1409 params.additional_features.push_back(features.additionalFeatures[i]); |
| 1410 | 1410 |
| 1411 int32 routing_id = MSG_ROUTING_NONE; | 1411 int32 routing_id = MSG_ROUTING_NONE; |
| 1412 int32 main_frame_routing_id = MSG_ROUTING_NONE; | 1412 int32 main_frame_routing_id = MSG_ROUTING_NONE; |
| 1413 int32 surface_id = 0; | 1413 int32 surface_id = 0; |
| 1414 int64 cloned_session_storage_namespace_id; | 1414 int64 cloned_session_storage_namespace_id = 0; |
| 1415 | 1415 |
| 1416 RenderThread::Get()->Send( | 1416 RenderThread::Get()->Send( |
| 1417 new ViewHostMsg_CreateWindow(params, | 1417 new ViewHostMsg_CreateWindow(params, |
| 1418 &routing_id, | 1418 &routing_id, |
| 1419 &main_frame_routing_id, | 1419 &main_frame_routing_id, |
| 1420 &surface_id, | 1420 &surface_id, |
| 1421 &cloned_session_storage_namespace_id)); | 1421 &cloned_session_storage_namespace_id)); |
| 1422 if (routing_id == MSG_ROUTING_NONE) | 1422 if (routing_id == MSG_ROUTING_NONE) |
| 1423 return NULL; | 1423 return NULL; |
| 1424 | 1424 |
| (...skipping 2557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3982 std::vector<gfx::Size> sizes; | 3982 std::vector<gfx::Size> sizes; |
| 3983 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3983 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3984 if (!url.isEmpty()) | 3984 if (!url.isEmpty()) |
| 3985 urls.push_back( | 3985 urls.push_back( |
| 3986 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3986 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3987 } | 3987 } |
| 3988 SendUpdateFaviconURL(urls); | 3988 SendUpdateFaviconURL(urls); |
| 3989 } | 3989 } |
| 3990 | 3990 |
| 3991 } // namespace content | 3991 } // namespace content |
| OLD | NEW |