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 1927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1938 WebFrame* creator, | 1938 WebFrame* creator, |
1939 const WebURLRequest& request, | 1939 const WebURLRequest& request, |
1940 const WebWindowFeatures& features, | 1940 const WebWindowFeatures& features, |
1941 const WebString& frame_name, | 1941 const WebString& frame_name, |
1942 WebNavigationPolicy policy) { | 1942 WebNavigationPolicy policy) { |
1943 // Check to make sure we aren't overloading on popups. | 1943 // Check to make sure we aren't overloading on popups. |
1944 if (shared_popup_counter_->data > kMaximumNumberOfUnacknowledgedPopups) | 1944 if (shared_popup_counter_->data > kMaximumNumberOfUnacknowledgedPopups) |
1945 return NULL; | 1945 return NULL; |
1946 | 1946 |
1947 ViewHostMsg_CreateWindow_Params params; | 1947 ViewHostMsg_CreateWindow_Params params; |
| 1948 WebKit::WindowFeatures window_features(features); |
| 1949 |
| 1950 params.window_features = window_features; |
1948 params.opener_id = routing_id_; | 1951 params.opener_id = routing_id_; |
1949 params.user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); | 1952 params.user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); |
1950 params.window_container_type = WindowFeaturesToContainerType(features); | 1953 params.window_container_type = WindowFeaturesToContainerType(features); |
1951 params.session_storage_namespace_id = session_storage_namespace_id_; | 1954 params.session_storage_namespace_id = session_storage_namespace_id_; |
1952 if (frame_name != "_blank") | 1955 if (frame_name != "_blank") |
1953 params.frame_name = frame_name; | 1956 params.frame_name = frame_name; |
1954 params.opener_frame_id = creator->identifier(); | 1957 params.opener_frame_id = creator->identifier(); |
1955 params.opener_url = creator->document().url(); | 1958 params.opener_url = creator->document().url(); |
1956 GURL security_url(creator->document().securityOrigin().toString().utf8()); | 1959 GURL security_url(creator->document().securityOrigin().toString().utf8()); |
1957 if (!security_url.is_valid()) | 1960 if (!security_url.is_valid()) |
(...skipping 4569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6527 WebURL url = icon_urls[i].iconURL(); | 6530 WebURL url = icon_urls[i].iconURL(); |
6528 if (!url.isEmpty()) | 6531 if (!url.isEmpty()) |
6529 urls.push_back(FaviconURL(url, | 6532 urls.push_back(FaviconURL(url, |
6530 ToFaviconType(icon_urls[i].iconType()))); | 6533 ToFaviconType(icon_urls[i].iconType()))); |
6531 } | 6534 } |
6532 SendUpdateFaviconURL(urls); | 6535 SendUpdateFaviconURL(urls); |
6533 } | 6536 } |
6534 | 6537 |
6535 | 6538 |
6536 } // namespace content | 6539 } // namespace content |
OLD | NEW |