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 2271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2282 params.opener_id = routing_id_; | 2282 params.opener_id = routing_id_; |
2283 params.user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); | 2283 params.user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); |
2284 if (GetContentClient()->renderer()->AllowPopup()) | 2284 if (GetContentClient()->renderer()->AllowPopup()) |
2285 params.user_gesture = true; | 2285 params.user_gesture = true; |
2286 params.window_container_type = WindowFeaturesToContainerType(features); | 2286 params.window_container_type = WindowFeaturesToContainerType(features); |
2287 params.session_storage_namespace_id = session_storage_namespace_id_; | 2287 params.session_storage_namespace_id = session_storage_namespace_id_; |
2288 if (frame_name != "_blank") | 2288 if (frame_name != "_blank") |
2289 params.frame_name = frame_name; | 2289 params.frame_name = frame_name; |
2290 params.opener_frame_id = creator->identifier(); | 2290 params.opener_frame_id = creator->identifier(); |
2291 params.opener_url = creator->document().url(); | 2291 params.opener_url = creator->document().url(); |
| 2292 params.opener_top_level_frame_url = creator->top()->document().url(); |
2292 GURL security_url(creator->document().securityOrigin().toString().utf8()); | 2293 GURL security_url(creator->document().securityOrigin().toString().utf8()); |
2293 if (!security_url.is_valid()) | 2294 if (!security_url.is_valid()) |
2294 security_url = GURL(); | 2295 security_url = GURL(); |
2295 params.opener_security_origin = security_url; | 2296 params.opener_security_origin = security_url; |
2296 params.opener_suppressed = creator->willSuppressOpenerInNewFrame(); | 2297 params.opener_suppressed = creator->willSuppressOpenerInNewFrame(); |
2297 params.disposition = NavigationPolicyToDisposition(policy); | 2298 params.disposition = NavigationPolicyToDisposition(policy); |
2298 if (!request.isNull()) { | 2299 if (!request.isNull()) { |
2299 params.target_url = request.url(); | 2300 params.target_url = request.url(); |
2300 params.referrer = GetReferrerFromRequest(creator, request); | 2301 params.referrer = GetReferrerFromRequest(creator, request); |
2301 } | 2302 } |
(...skipping 4219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6521 for (size_t i = 0; i < icon_urls.size(); i++) { | 6522 for (size_t i = 0; i < icon_urls.size(); i++) { |
6522 WebURL url = icon_urls[i].iconURL(); | 6523 WebURL url = icon_urls[i].iconURL(); |
6523 if (!url.isEmpty()) | 6524 if (!url.isEmpty()) |
6524 urls.push_back(FaviconURL(url, | 6525 urls.push_back(FaviconURL(url, |
6525 ToFaviconType(icon_urls[i].iconType()))); | 6526 ToFaviconType(icon_urls[i].iconType()))); |
6526 } | 6527 } |
6527 SendUpdateFaviconURL(urls); | 6528 SendUpdateFaviconURL(urls); |
6528 } | 6529 } |
6529 | 6530 |
6530 } // namespace content | 6531 } // namespace content |
OLD | NEW |