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

Side by Side Diff: content/public/browser/content_browser_client.cc

Issue 2976323002: Hook up ProfileIOData's URLRequestContext to a NetworkService. (Closed)
Patch Set: X11 is bonkers 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/public/browser/content_browser_client.h" 5 #include "content/public/browser/content_browser_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/guid.h" 10 #include "base/guid.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "content/public/browser/client_certificate_delegate.h" 13 #include "content/public/browser/client_certificate_delegate.h"
14 #include "content/public/browser/memory_coordinator_delegate.h" 14 #include "content/public/browser/memory_coordinator_delegate.h"
15 #include "content/public/browser/navigation_ui_data.h" 15 #include "content/public/browser/navigation_ui_data.h"
16 #include "content/public/browser/network_service_instance.h"
16 #include "content/public/browser/vpn_service_proxy.h" 17 #include "content/public/browser/vpn_service_proxy.h"
17 #include "content/public/common/sandbox_type.h" 18 #include "content/public/common/sandbox_type.h"
18 #include "content/public/common/url_loader_throttle.h" 19 #include "content/public/common/url_loader_throttle.h"
19 #include "media/audio/audio_manager.h" 20 #include "media/audio/audio_manager.h"
20 #include "media/base/cdm_factory.h" 21 #include "media/base/cdm_factory.h"
21 #include "media/media_features.h" 22 #include "media/media_features.h"
23 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
22 #include "net/ssl/client_cert_identity.h" 24 #include "net/ssl/client_cert_identity.h"
23 #include "storage/browser/quota/quota_manager.h" 25 #include "storage/browser/quota/quota_manager.h"
24 #include "ui/gfx/image/image_skia.h" 26 #include "ui/gfx/image/image_skia.h"
25 #include "url/gurl.h" 27 #include "url/gurl.h"
26 28
27 namespace content { 29 namespace content {
28 30
29 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( 31 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
30 const MainFunctionParams& parameters) { 32 const MainFunctionParams& parameters) {
31 return nullptr; 33 return nullptr;
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 ContentBrowserClient::GetTaskSchedulerInitParams() { 472 ContentBrowserClient::GetTaskSchedulerInitParams() {
471 return nullptr; 473 return nullptr;
472 } 474 }
473 475
474 std::vector<std::unique_ptr<URLLoaderThrottle>> 476 std::vector<std::unique_ptr<URLLoaderThrottle>>
475 ContentBrowserClient::CreateURLLoaderThrottles( 477 ContentBrowserClient::CreateURLLoaderThrottles(
476 const base::Callback<WebContents*()>& wc_getter) { 478 const base::Callback<WebContents*()>& wc_getter) {
477 return std::vector<std::unique_ptr<URLLoaderThrottle>>(); 479 return std::vector<std::unique_ptr<URLLoaderThrottle>>();
478 } 480 }
479 481
482 mojom::NetworkContextPtr ContentBrowserClient::CreateMainNetworkContext(
483 BrowserContext* context) {
484 mojom::NetworkContextPtr network_context;
485 mojom::NetworkContextParamsPtr context_params =
486 mojom::NetworkContextParams::New();
487 GetNetworkService()->CreateNetworkContext(MakeRequest(&network_context),
488 std::move(context_params));
489 return network_context;
490 }
491
492 mojom::NetworkContextPtr
493 ContentBrowserClient::CreateNetworkContextForStoragePartition(
494 BrowserContext* context,
495 bool in_memory,
496 const base::FilePath& partition_path) {
497 return ContentBrowserClient::CreateMainNetworkContext(context);
jam 2017/07/18 20:26:27 should this be setting up NetworkContextParams and
mmenke 2017/07/18 20:57:34 Moot point, since I've merged it with CreateMainNe
498 }
499
480 } // namespace content 500 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698