Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(434)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2864023003: Fix the current per-frame URLLoaderFactory code path. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 4479 matching lines...) Expand 10 before | Expand all | Expand 10 after
4490 // was a navigation initiated by the renderer to the new RequestExtraData 4490 // was a navigation initiated by the renderer to the new RequestExtraData
4491 // instance. 4491 // instance.
4492 RequestExtraData* current_request_data = 4492 RequestExtraData* current_request_data =
4493 static_cast<RequestExtraData*>(request.GetExtraData()); 4493 static_cast<RequestExtraData*>(request.GetExtraData());
4494 if (current_request_data) { 4494 if (current_request_data) {
4495 extra_data->set_navigation_initiated_by_renderer( 4495 extra_data->set_navigation_initiated_by_renderer(
4496 current_request_data->navigation_initiated_by_renderer()); 4496 current_request_data->navigation_initiated_by_renderer());
4497 } 4497 }
4498 } 4498 }
4499 4499
4500 extra_data->set_url_loader_factory_override(url_loader_factory_.get());
4501
4500 request.SetExtraData(extra_data); 4502 request.SetExtraData(extra_data);
4501 4503
4502 if (request.GetPreviewsState() == WebURLRequest::kPreviewsUnspecified) { 4504 if (request.GetPreviewsState() == WebURLRequest::kPreviewsUnspecified) {
4503 if (is_main_frame_ && !navigation_state->request_committed()) { 4505 if (is_main_frame_ && !navigation_state->request_committed()) {
4504 request.SetPreviewsState(static_cast<WebURLRequest::PreviewsState>( 4506 request.SetPreviewsState(static_cast<WebURLRequest::PreviewsState>(
4505 navigation_state->common_params().previews_state)); 4507 navigation_state->common_params().previews_state));
4506 } else { 4508 } else {
4507 WebURLRequest::PreviewsState request_previews_state = 4509 WebURLRequest::PreviewsState request_previews_state =
4508 static_cast<WebURLRequest::PreviewsState>(previews_state_); 4510 static_cast<WebURLRequest::PreviewsState>(previews_state_);
4509 4511
(...skipping 2594 matching lines...) Expand 10 before | Expand all | Expand 10 after
7104 policy(info.default_policy), 7106 policy(info.default_policy),
7105 replaces_current_history_item(info.replaces_current_history_item), 7107 replaces_current_history_item(info.replaces_current_history_item),
7106 history_navigation_in_new_child_frame( 7108 history_navigation_in_new_child_frame(
7107 info.is_history_navigation_in_new_child_frame), 7109 info.is_history_navigation_in_new_child_frame),
7108 client_redirect(info.is_client_redirect), 7110 client_redirect(info.is_client_redirect),
7109 cache_disabled(info.is_cache_disabled), 7111 cache_disabled(info.is_cache_disabled),
7110 form(info.form), 7112 form(info.form),
7111 source_location(info.source_location) {} 7113 source_location(info.source_location) {}
7112 7114
7113 } // namespace content 7115 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698