OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 5145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5156 // TODO(clamy): Remove this when we switch to Mojo streams. | 5156 // TODO(clamy): Remove this when we switch to Mojo streams. |
5157 stream_override->on_delete = base::BindOnce( | 5157 stream_override->on_delete = base::BindOnce( |
5158 [](base::WeakPtr<RenderFrameImpl> weak_self, const GURL& url) { | 5158 [](base::WeakPtr<RenderFrameImpl> weak_self, const GURL& url) { |
5159 if (RenderFrameImpl* self = weak_self.get()) { | 5159 if (RenderFrameImpl* self = weak_self.get()) { |
5160 self->Send( | 5160 self->Send( |
5161 new FrameHostMsg_StreamHandleConsumed(self->routing_id_, url)); | 5161 new FrameHostMsg_StreamHandleConsumed(self->routing_id_, url)); |
5162 } | 5162 } |
5163 }, | 5163 }, |
5164 weak_factory_.GetWeakPtr()); | 5164 weak_factory_.GetWeakPtr()); |
5165 | 5165 |
5166 if (commit_data.url_loader_factory.is_valid()) { | 5166 // Chrome doesn't use interface versioning. |
5167 // Chrome doesn't use interface versioning. | 5167 url_loader_factory_.Bind(mojom::URLLoaderFactoryPtrInfo( |
5168 url_loader_factory_.Bind(mojom::URLLoaderFactoryPtrInfo( | 5168 mojo::ScopedMessagePipeHandle(commit_data.url_loader_factory), 0u)); |
5169 mojo::ScopedMessagePipeHandle(commit_data.url_loader_factory), 0u)); | |
5170 } | |
5171 | 5169 |
5172 // If the request was initiated in the context of a user gesture then make | 5170 // If the request was initiated in the context of a user gesture then make |
5173 // sure that the navigation also executes in the context of a user gesture. | 5171 // sure that the navigation also executes in the context of a user gesture. |
5174 std::unique_ptr<blink::WebScopedUserGesture> gesture( | 5172 std::unique_ptr<blink::WebScopedUserGesture> gesture( |
5175 request_params.has_user_gesture ? new blink::WebScopedUserGesture(frame_) | 5173 request_params.has_user_gesture ? new blink::WebScopedUserGesture(frame_) |
5176 : nullptr); | 5174 : nullptr); |
5177 | 5175 |
5178 browser_side_navigation_pending_ = false; | 5176 browser_side_navigation_pending_ = false; |
5179 | 5177 |
5180 NavigateInternal(common_params, StartNavigationParams(), request_params, | 5178 NavigateInternal(common_params, StartNavigationParams(), request_params, |
(...skipping 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6917 replaces_current_history_item(info.replaces_current_history_item), | 6915 replaces_current_history_item(info.replaces_current_history_item), |
6918 history_navigation_in_new_child_frame( | 6916 history_navigation_in_new_child_frame( |
6919 info.is_history_navigation_in_new_child_frame), | 6917 info.is_history_navigation_in_new_child_frame), |
6920 client_redirect(info.is_client_redirect), | 6918 client_redirect(info.is_client_redirect), |
6921 triggering_event_info(info.triggering_event_info), | 6919 triggering_event_info(info.triggering_event_info), |
6922 cache_disabled(info.is_cache_disabled), | 6920 cache_disabled(info.is_cache_disabled), |
6923 form(info.form), | 6921 form(info.form), |
6924 source_location(info.source_location) {} | 6922 source_location(info.source_location) {} |
6925 | 6923 |
6926 } // namespace content | 6924 } // namespace content |
OLD | NEW |