OLD | NEW |
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 Loading... |
1062 } | 1062 } |
1063 | 1063 |
1064 // These are treated as WebUI schemes but do not get WebUI bindings. Also, | 1064 // These are treated as WebUI schemes but do not get WebUI bindings. Also, |
1065 // view-source is allowed for these schemes. | 1065 // view-source is allowed for these schemes. |
1066 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( | 1066 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( |
1067 std::vector<std::string>* additional_schemes) { | 1067 std::vector<std::string>* additional_schemes) { |
1068 additional_schemes->push_back(chrome::kChromeSearchScheme); | 1068 additional_schemes->push_back(chrome::kChromeSearchScheme); |
1069 additional_schemes->push_back(chrome::kDomDistillerScheme); | 1069 additional_schemes->push_back(chrome::kDomDistillerScheme); |
1070 } | 1070 } |
1071 | 1071 |
1072 net::URLRequestContextGetter* ChromeContentBrowserClient::CreateRequestContext( | 1072 void ChromeContentBrowserClient::GetAdditionalWebUIHostsToIgnoreParititionCheck( |
| 1073 std::vector<std::string>* hosts) { |
| 1074 hosts->push_back(chrome::kChromeUIExtensionIconHost); |
| 1075 hosts->push_back(chrome::kChromeUIFaviconHost); |
| 1076 hosts->push_back(chrome::kChromeUIThemeHost); |
| 1077 hosts->push_back(chrome::kChromeUIThumbnailHost); |
| 1078 hosts->push_back(chrome::kChromeUIThumbnailHost2); |
| 1079 hosts->push_back(chrome::kChromeUIThumbnailListHost); |
| 1080 } |
| 1081 |
| 1082 net::URLRequestContextGetter* |
| 1083 ChromeContentBrowserClient::CreateRequestContext( |
1073 content::BrowserContext* browser_context, | 1084 content::BrowserContext* browser_context, |
1074 content::ProtocolHandlerMap* protocol_handlers, | 1085 content::ProtocolHandlerMap* protocol_handlers, |
1075 content::ProtocolHandlerScopedVector protocol_interceptors) { | 1086 content::ProtocolHandlerScopedVector protocol_interceptors) { |
1076 Profile* profile = Profile::FromBrowserContext(browser_context); | 1087 Profile* profile = Profile::FromBrowserContext(browser_context); |
1077 return profile->CreateRequestContext(protocol_handlers, | 1088 return profile->CreateRequestContext(protocol_handlers, |
1078 protocol_interceptors.Pass()); | 1089 protocol_interceptors.Pass()); |
1079 } | 1090 } |
1080 | 1091 |
1081 net::URLRequestContextGetter* | 1092 net::URLRequestContextGetter* |
1082 ChromeContentBrowserClient::CreateRequestContextForStoragePartition( | 1093 ChromeContentBrowserClient::CreateRequestContextForStoragePartition( |
(...skipping 1648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2731 switches::kDisableWebRtcEncryption, | 2742 switches::kDisableWebRtcEncryption, |
2732 }; | 2743 }; |
2733 to_command_line->CopySwitchesFrom(from_command_line, | 2744 to_command_line->CopySwitchesFrom(from_command_line, |
2734 kWebRtcDevSwitchNames, | 2745 kWebRtcDevSwitchNames, |
2735 arraysize(kWebRtcDevSwitchNames)); | 2746 arraysize(kWebRtcDevSwitchNames)); |
2736 } | 2747 } |
2737 } | 2748 } |
2738 #endif // defined(ENABLE_WEBRTC) | 2749 #endif // defined(ENABLE_WEBRTC) |
2739 | 2750 |
2740 } // namespace chrome | 2751 } // namespace chrome |
OLD | NEW |