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 2356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2367 security_url = GURL(); | 2367 security_url = GURL(); |
2368 params.opener_security_origin = security_url; | 2368 params.opener_security_origin = security_url; |
2369 params.opener_suppressed = suppress_opener; | 2369 params.opener_suppressed = suppress_opener; |
2370 params.disposition = NavigationPolicyToDisposition(policy); | 2370 params.disposition = NavigationPolicyToDisposition(policy); |
2371 if (!request.isNull()) { | 2371 if (!request.isNull()) { |
2372 params.target_url = request.url(); | 2372 params.target_url = request.url(); |
2373 params.referrer = GetReferrerFromRequest(creator, request); | 2373 params.referrer = GetReferrerFromRequest(creator, request); |
2374 } | 2374 } |
2375 params.features = features; | 2375 params.features = features; |
2376 | 2376 |
| 2377 for (size_t i = 0; i < features.additionalFeatures.size(); ++i) |
| 2378 params.additional_features.push_back(features.additionalFeatures[i]); |
| 2379 |
2377 int32 routing_id = MSG_ROUTING_NONE; | 2380 int32 routing_id = MSG_ROUTING_NONE; |
2378 int32 main_frame_routing_id = MSG_ROUTING_NONE; | 2381 int32 main_frame_routing_id = MSG_ROUTING_NONE; |
2379 int32 surface_id = 0; | 2382 int32 surface_id = 0; |
2380 int64 cloned_session_storage_namespace_id; | 2383 int64 cloned_session_storage_namespace_id; |
2381 | 2384 |
2382 RenderThread::Get()->Send( | 2385 RenderThread::Get()->Send( |
2383 new ViewHostMsg_CreateWindow(params, | 2386 new ViewHostMsg_CreateWindow(params, |
2384 &routing_id, | 2387 &routing_id, |
2385 &main_frame_routing_id, | 2388 &main_frame_routing_id, |
2386 &surface_id, | 2389 &surface_id, |
(...skipping 4271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6658 for (size_t i = 0; i < icon_urls.size(); i++) { | 6661 for (size_t i = 0; i < icon_urls.size(); i++) { |
6659 WebURL url = icon_urls[i].iconURL(); | 6662 WebURL url = icon_urls[i].iconURL(); |
6660 if (!url.isEmpty()) | 6663 if (!url.isEmpty()) |
6661 urls.push_back(FaviconURL(url, | 6664 urls.push_back(FaviconURL(url, |
6662 ToFaviconType(icon_urls[i].iconType()))); | 6665 ToFaviconType(icon_urls[i].iconType()))); |
6663 } | 6666 } |
6664 SendUpdateFaviconURL(urls); | 6667 SendUpdateFaviconURL(urls); |
6665 } | 6668 } |
6666 | 6669 |
6667 } // namespace content | 6670 } // namespace content |
OLD | NEW |