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

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

Issue 2960703003: Add a feature flag for network service and about:flags entry for it. (Closed)
Patch Set: more updates Created 3 years, 5 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
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 <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 4326 matching lines...) Expand 10 before | Expand all | Expand 10 after
4337 // instance. 4337 // instance.
4338 RequestExtraData* current_request_data = 4338 RequestExtraData* current_request_data =
4339 static_cast<RequestExtraData*>(request.GetExtraData()); 4339 static_cast<RequestExtraData*>(request.GetExtraData());
4340 if (current_request_data) { 4340 if (current_request_data) {
4341 extra_data->set_navigation_initiated_by_renderer( 4341 extra_data->set_navigation_initiated_by_renderer(
4342 current_request_data->navigation_initiated_by_renderer()); 4342 current_request_data->navigation_initiated_by_renderer());
4343 } 4343 }
4344 } 4344 }
4345 4345
4346 // TODO: generalize how non-network schemes are sent to the renderer and used. 4346 // TODO: generalize how non-network schemes are sent to the renderer and used.
4347 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 4347 if (base::FeatureList::IsEnabled(features::kNetworkService)) {
4348 switches::kEnableNetworkService)) {
4349 if (request.Url().ProtocolIs(url::kBlobScheme)) { 4348 if (request.Url().ProtocolIs(url::kBlobScheme)) {
4350 extra_data->set_url_loader_factory_override( 4349 extra_data->set_url_loader_factory_override(
4351 RenderThreadImpl::current()->GetBlobURLLoaderFactory()); 4350 RenderThreadImpl::current()->GetBlobURLLoaderFactory());
4352 } 4351 }
4353 } 4352 }
4354 4353
4355 if (!extra_data->url_loader_factory_override()) 4354 if (!extra_data->url_loader_factory_override())
4356 extra_data->set_url_loader_factory_override(url_loader_factory_.get()); 4355 extra_data->set_url_loader_factory_override(url_loader_factory_.get());
4357 4356
4358 // TODO(kinuko, yzshen): We need to set up throttles for some worker cases 4357 // TODO(kinuko, yzshen): We need to set up throttles for some worker cases
(...skipping 2527 matching lines...) Expand 10 before | Expand all | Expand 10 after
6886 replaces_current_history_item(info.replaces_current_history_item), 6885 replaces_current_history_item(info.replaces_current_history_item),
6887 history_navigation_in_new_child_frame( 6886 history_navigation_in_new_child_frame(
6888 info.is_history_navigation_in_new_child_frame), 6887 info.is_history_navigation_in_new_child_frame),
6889 client_redirect(info.is_client_redirect), 6888 client_redirect(info.is_client_redirect),
6890 triggering_event_info(info.triggering_event_info), 6889 triggering_event_info(info.triggering_event_info),
6891 cache_disabled(info.is_cache_disabled), 6890 cache_disabled(info.is_cache_disabled),
6892 form(info.form), 6891 form(info.form),
6893 source_location(info.source_location) {} 6892 source_location(info.source_location) {}
6894 6893
6895 } // namespace content 6894 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698