| 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 <string.h> | 7 #include <string.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 5163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5174 // TODO(clamy): Remove this when we switch to Mojo streams. | 5174 // TODO(clamy): Remove this when we switch to Mojo streams. |
| 5175 stream_override->on_delete = base::BindOnce( | 5175 stream_override->on_delete = base::BindOnce( |
| 5176 [](base::WeakPtr<RenderFrameImpl> weak_self, const GURL& url) { | 5176 [](base::WeakPtr<RenderFrameImpl> weak_self, const GURL& url) { |
| 5177 if (RenderFrameImpl* self = weak_self.get()) { | 5177 if (RenderFrameImpl* self = weak_self.get()) { |
| 5178 self->Send( | 5178 self->Send( |
| 5179 new FrameHostMsg_StreamHandleConsumed(self->routing_id_, url)); | 5179 new FrameHostMsg_StreamHandleConsumed(self->routing_id_, url)); |
| 5180 } | 5180 } |
| 5181 }, | 5181 }, |
| 5182 weak_factory_.GetWeakPtr()); | 5182 weak_factory_.GetWeakPtr()); |
| 5183 | 5183 |
| 5184 if (commit_data.url_loader_factory.is_valid()) { | 5184 // Chrome doesn't use interface versioning. |
| 5185 // Chrome doesn't use interface versioning. | 5185 url_loader_factory_.Bind(mojom::URLLoaderFactoryPtrInfo( |
| 5186 url_loader_factory_.Bind(mojom::URLLoaderFactoryPtrInfo( | 5186 mojo::ScopedMessagePipeHandle(commit_data.url_loader_factory), 0u)); |
| 5187 mojo::ScopedMessagePipeHandle(commit_data.url_loader_factory), 0u)); | |
| 5188 } | |
| 5189 | 5187 |
| 5190 // If the request was initiated in the context of a user gesture then make | 5188 // If the request was initiated in the context of a user gesture then make |
| 5191 // sure that the navigation also executes in the context of a user gesture. | 5189 // sure that the navigation also executes in the context of a user gesture. |
| 5192 std::unique_ptr<blink::WebScopedUserGesture> gesture( | 5190 std::unique_ptr<blink::WebScopedUserGesture> gesture( |
| 5193 request_params.has_user_gesture ? new blink::WebScopedUserGesture(frame_) | 5191 request_params.has_user_gesture ? new blink::WebScopedUserGesture(frame_) |
| 5194 : nullptr); | 5192 : nullptr); |
| 5195 | 5193 |
| 5196 browser_side_navigation_pending_ = false; | 5194 browser_side_navigation_pending_ = false; |
| 5197 | 5195 |
| 5198 NavigateInternal(common_params, StartNavigationParams(), request_params, | 5196 NavigateInternal(common_params, StartNavigationParams(), request_params, |
| (...skipping 1837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7036 replaces_current_history_item(info.replaces_current_history_item), | 7034 replaces_current_history_item(info.replaces_current_history_item), |
| 7037 history_navigation_in_new_child_frame( | 7035 history_navigation_in_new_child_frame( |
| 7038 info.is_history_navigation_in_new_child_frame), | 7036 info.is_history_navigation_in_new_child_frame), |
| 7039 client_redirect(info.is_client_redirect), | 7037 client_redirect(info.is_client_redirect), |
| 7040 triggering_event_info(info.triggering_event_info), | 7038 triggering_event_info(info.triggering_event_info), |
| 7041 cache_disabled(info.is_cache_disabled), | 7039 cache_disabled(info.is_cache_disabled), |
| 7042 form(info.form), | 7040 form(info.form), |
| 7043 source_location(info.source_location) {} | 7041 source_location(info.source_location) {} |
| 7044 | 7042 |
| 7045 } // namespace content | 7043 } // namespace content |
| OLD | NEW |