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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 282103004: Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Response to jam's comments (And a merge) Created 6 years, 6 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 | Annotate | Revision Log
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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 hosts->push_back(chrome::kChromeUIThemeHost); 1062 hosts->push_back(chrome::kChromeUIThemeHost);
1063 hosts->push_back(chrome::kChromeUIThumbnailHost); 1063 hosts->push_back(chrome::kChromeUIThumbnailHost);
1064 hosts->push_back(chrome::kChromeUIThumbnailHost2); 1064 hosts->push_back(chrome::kChromeUIThumbnailHost2);
1065 hosts->push_back(chrome::kChromeUIThumbnailListHost); 1065 hosts->push_back(chrome::kChromeUIThumbnailListHost);
1066 } 1066 }
1067 1067
1068 net::URLRequestContextGetter* 1068 net::URLRequestContextGetter*
1069 ChromeContentBrowserClient::CreateRequestContext( 1069 ChromeContentBrowserClient::CreateRequestContext(
1070 content::BrowserContext* browser_context, 1070 content::BrowserContext* browser_context,
1071 content::ProtocolHandlerMap* protocol_handlers, 1071 content::ProtocolHandlerMap* protocol_handlers,
1072 content::ProtocolHandlerScopedVector protocol_interceptors) { 1072 content::URLRequestInterceptorScopedVector request_interceptors) {
1073 Profile* profile = Profile::FromBrowserContext(browser_context); 1073 Profile* profile = Profile::FromBrowserContext(browser_context);
1074 return profile->CreateRequestContext(protocol_handlers, 1074 return profile->CreateRequestContext(protocol_handlers,
1075 protocol_interceptors.Pass()); 1075 request_interceptors.Pass());
1076 } 1076 }
1077 1077
1078 net::URLRequestContextGetter* 1078 net::URLRequestContextGetter*
1079 ChromeContentBrowserClient::CreateRequestContextForStoragePartition( 1079 ChromeContentBrowserClient::CreateRequestContextForStoragePartition(
1080 content::BrowserContext* browser_context, 1080 content::BrowserContext* browser_context,
1081 const base::FilePath& partition_path, 1081 const base::FilePath& partition_path,
1082 bool in_memory, 1082 bool in_memory,
1083 content::ProtocolHandlerMap* protocol_handlers, 1083 content::ProtocolHandlerMap* protocol_handlers,
1084 content::ProtocolHandlerScopedVector protocol_interceptors) { 1084 content::URLRequestInterceptorScopedVector request_interceptors) {
1085 Profile* profile = Profile::FromBrowserContext(browser_context); 1085 Profile* profile = Profile::FromBrowserContext(browser_context);
1086 return profile->CreateRequestContextForStoragePartition( 1086 return profile->CreateRequestContextForStoragePartition(
1087 partition_path, 1087 partition_path,
1088 in_memory, 1088 in_memory,
1089 protocol_handlers, 1089 protocol_handlers,
1090 protocol_interceptors.Pass()); 1090 request_interceptors.Pass());
1091 } 1091 }
1092 1092
1093 bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) { 1093 bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) {
1094 return ProfileIOData::IsHandledURL(url); 1094 return ProfileIOData::IsHandledURL(url);
1095 } 1095 }
1096 1096
1097 bool ChromeContentBrowserClient::CanCommitURL( 1097 bool ChromeContentBrowserClient::CanCommitURL(
1098 content::RenderProcessHost* process_host, 1098 content::RenderProcessHost* process_host,
1099 const GURL& url) { 1099 const GURL& url) {
1100 // We need to let most extension URLs commit in any process, since this can 1100 // We need to let most extension URLs commit in any process, since this can
(...skipping 1655 matching lines...) Expand 10 before | Expand all | Expand 10 after
2756 switches::kDisableWebRtcEncryption, 2756 switches::kDisableWebRtcEncryption,
2757 }; 2757 };
2758 to_command_line->CopySwitchesFrom(from_command_line, 2758 to_command_line->CopySwitchesFrom(from_command_line,
2759 kWebRtcDevSwitchNames, 2759 kWebRtcDevSwitchNames,
2760 arraysize(kWebRtcDevSwitchNames)); 2760 arraysize(kWebRtcDevSwitchNames));
2761 } 2761 }
2762 } 2762 }
2763 #endif // defined(ENABLE_WEBRTC) 2763 #endif // defined(ENABLE_WEBRTC)
2764 2764
2765 } // namespace chrome 2765 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/net/chrome_url_request_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698