Chromium Code Reviews| 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 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1065 } | 1065 } |
| 1066 | 1066 |
| 1067 // These are treated as WebUI schemes but do not get WebUI bindings. Also, | 1067 // These are treated as WebUI schemes but do not get WebUI bindings. Also, |
| 1068 // view-source is allowed for these schemes. | 1068 // view-source is allowed for these schemes. |
| 1069 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( | 1069 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( |
| 1070 std::vector<std::string>* additional_schemes) { | 1070 std::vector<std::string>* additional_schemes) { |
| 1071 additional_schemes->push_back(chrome::kChromeSearchScheme); | 1071 additional_schemes->push_back(chrome::kChromeSearchScheme); |
| 1072 additional_schemes->push_back(chrome::kDomDistillerScheme); | 1072 additional_schemes->push_back(chrome::kDomDistillerScheme); |
| 1073 } | 1073 } |
| 1074 | 1074 |
| 1075 void ChromeContentBrowserClient::GetWebUIHostsToIgnoreParititionCheck( | |
| 1076 std::vector<std::string>* hosts) { | |
| 1077 content::ContentBrowserClient::GetWebUIHostsToIgnoreParititionCheck(hosts); | |
|
jam
2014/03/05 22:29:46
nit: then remove this line
guohui
2014/03/05 23:04:24
Done.
| |
| 1078 | |
| 1079 hosts->push_back(chrome::kChromeUIFaviconHost); | |
| 1080 hosts->push_back(chrome::kChromeUIThemeHost); | |
| 1081 hosts->push_back(chrome::kChromeUIThumbnailHost); | |
| 1082 hosts->push_back(chrome::kChromeUIThumbnailHost2); | |
| 1083 hosts->push_back(chrome::kChromeUIThumbnailListHost); | |
| 1084 } | |
| 1085 | |
| 1075 net::URLRequestContextGetter* | 1086 net::URLRequestContextGetter* |
| 1076 ChromeContentBrowserClient::CreateRequestContext( | 1087 ChromeContentBrowserClient::CreateRequestContext( |
| 1077 content::BrowserContext* browser_context, | 1088 content::BrowserContext* browser_context, |
| 1078 content::ProtocolHandlerMap* protocol_handlers) { | 1089 content::ProtocolHandlerMap* protocol_handlers) { |
| 1079 Profile* profile = Profile::FromBrowserContext(browser_context); | 1090 Profile* profile = Profile::FromBrowserContext(browser_context); |
| 1080 return profile->CreateRequestContext(protocol_handlers); | 1091 return profile->CreateRequestContext(protocol_handlers); |
| 1081 } | 1092 } |
| 1082 | 1093 |
| 1083 net::URLRequestContextGetter* | 1094 net::URLRequestContextGetter* |
| 1084 ChromeContentBrowserClient::CreateRequestContextForStoragePartition( | 1095 ChromeContentBrowserClient::CreateRequestContextForStoragePartition( |
| (...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2728 switches::kDisableWebRtcEncryption, | 2739 switches::kDisableWebRtcEncryption, |
| 2729 }; | 2740 }; |
| 2730 to_command_line->CopySwitchesFrom(from_command_line, | 2741 to_command_line->CopySwitchesFrom(from_command_line, |
| 2731 kWebRtcDevSwitchNames, | 2742 kWebRtcDevSwitchNames, |
| 2732 arraysize(kWebRtcDevSwitchNames)); | 2743 arraysize(kWebRtcDevSwitchNames)); |
| 2733 } | 2744 } |
| 2734 } | 2745 } |
| 2735 #endif // defined(ENABLE_WEBRTC) | 2746 #endif // defined(ENABLE_WEBRTC) |
| 2736 | 2747 |
| 2737 } // namespace chrome | 2748 } // namespace chrome |
| OLD | NEW |