| 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 <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 4471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4482 // was a navigation initiated by the renderer to the new RequestExtraData | 4482 // was a navigation initiated by the renderer to the new RequestExtraData |
| 4483 // instance. | 4483 // instance. |
| 4484 RequestExtraData* current_request_data = | 4484 RequestExtraData* current_request_data = |
| 4485 static_cast<RequestExtraData*>(request.GetExtraData()); | 4485 static_cast<RequestExtraData*>(request.GetExtraData()); |
| 4486 if (current_request_data) { | 4486 if (current_request_data) { |
| 4487 extra_data->set_navigation_initiated_by_renderer( | 4487 extra_data->set_navigation_initiated_by_renderer( |
| 4488 current_request_data->navigation_initiated_by_renderer()); | 4488 current_request_data->navigation_initiated_by_renderer()); |
| 4489 } | 4489 } |
| 4490 } | 4490 } |
| 4491 | 4491 |
| 4492 extra_data->set_url_loader_factory_override(url_loader_factory_.get()); |
| 4493 |
| 4492 request.SetExtraData(extra_data); | 4494 request.SetExtraData(extra_data); |
| 4493 | 4495 |
| 4494 if (request.GetPreviewsState() == WebURLRequest::kPreviewsUnspecified) { | 4496 if (request.GetPreviewsState() == WebURLRequest::kPreviewsUnspecified) { |
| 4495 if (is_main_frame_ && !navigation_state->request_committed()) { | 4497 if (is_main_frame_ && !navigation_state->request_committed()) { |
| 4496 request.SetPreviewsState(static_cast<WebURLRequest::PreviewsState>( | 4498 request.SetPreviewsState(static_cast<WebURLRequest::PreviewsState>( |
| 4497 navigation_state->common_params().previews_state)); | 4499 navigation_state->common_params().previews_state)); |
| 4498 } else { | 4500 } else { |
| 4499 WebURLRequest::PreviewsState request_previews_state = | 4501 WebURLRequest::PreviewsState request_previews_state = |
| 4500 static_cast<WebURLRequest::PreviewsState>(previews_state_); | 4502 static_cast<WebURLRequest::PreviewsState>(previews_state_); |
| 4501 | 4503 |
| (...skipping 2594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7096 policy(info.default_policy), | 7098 policy(info.default_policy), |
| 7097 replaces_current_history_item(info.replaces_current_history_item), | 7099 replaces_current_history_item(info.replaces_current_history_item), |
| 7098 history_navigation_in_new_child_frame( | 7100 history_navigation_in_new_child_frame( |
| 7099 info.is_history_navigation_in_new_child_frame), | 7101 info.is_history_navigation_in_new_child_frame), |
| 7100 client_redirect(info.is_client_redirect), | 7102 client_redirect(info.is_client_redirect), |
| 7101 cache_disabled(info.is_cache_disabled), | 7103 cache_disabled(info.is_cache_disabled), |
| 7102 form(info.form), | 7104 form(info.form), |
| 7103 source_location(info.source_location) {} | 7105 source_location(info.source_location) {} |
| 7104 | 7106 |
| 7105 } // namespace content | 7107 } // namespace content |
| OLD | NEW |