| 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1093 } | 1093 } |
| 1094 | 1094 |
| 1095 // These are treated as WebUI schemes but do not get WebUI bindings. Also, | 1095 // These are treated as WebUI schemes but do not get WebUI bindings. Also, |
| 1096 // view-source is allowed for these schemes. | 1096 // view-source is allowed for these schemes. |
| 1097 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( | 1097 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( |
| 1098 std::vector<std::string>* additional_schemes) { | 1098 std::vector<std::string>* additional_schemes) { |
| 1099 additional_schemes->push_back(chrome::kChromeSearchScheme); | 1099 additional_schemes->push_back(chrome::kChromeSearchScheme); |
| 1100 additional_schemes->push_back(dom_distiller::kDomDistillerScheme); | 1100 additional_schemes->push_back(dom_distiller::kDomDistillerScheme); |
| 1101 } | 1101 } |
| 1102 | 1102 |
| 1103 void ChromeContentBrowserClient::GetAdditionalWebUIHostsToIgnoreParititionCheck( | |
| 1104 std::vector<std::string>* hosts) { | |
| 1105 hosts->push_back(chrome::kChromeUIExtensionIconHost); | |
| 1106 hosts->push_back(chrome::kChromeUIFaviconHost); | |
| 1107 hosts->push_back(chrome::kChromeUIThemeHost); | |
| 1108 hosts->push_back(chrome::kChromeUIThumbnailHost); | |
| 1109 hosts->push_back(chrome::kChromeUIThumbnailHost2); | |
| 1110 hosts->push_back(chrome::kChromeUIThumbnailListHost); | |
| 1111 } | |
| 1112 | |
| 1113 bool ChromeContentBrowserClient::LogWebUIUrl(const GURL& web_ui_url) const { | 1103 bool ChromeContentBrowserClient::LogWebUIUrl(const GURL& web_ui_url) const { |
| 1114 return webui::LogWebUIUrl(web_ui_url); | 1104 return webui::LogWebUIUrl(web_ui_url); |
| 1115 } | 1105 } |
| 1116 | 1106 |
| 1117 bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) { | 1107 bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) { |
| 1118 return ProfileIOData::IsHandledURL(url); | 1108 return ProfileIOData::IsHandledURL(url); |
| 1119 } | 1109 } |
| 1120 | 1110 |
| 1121 bool ChromeContentBrowserClient::CanCommitURL( | 1111 bool ChromeContentBrowserClient::CanCommitURL( |
| 1122 content::RenderProcessHost* process_host, | 1112 content::RenderProcessHost* process_host, |
| (...skipping 1881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3004 if (channel <= kMaxDisableEncryptionChannel) { | 2994 if (channel <= kMaxDisableEncryptionChannel) { |
| 3005 static const char* const kWebRtcDevSwitchNames[] = { | 2995 static const char* const kWebRtcDevSwitchNames[] = { |
| 3006 switches::kDisableWebRtcEncryption, | 2996 switches::kDisableWebRtcEncryption, |
| 3007 }; | 2997 }; |
| 3008 to_command_line->CopySwitchesFrom(from_command_line, | 2998 to_command_line->CopySwitchesFrom(from_command_line, |
| 3009 kWebRtcDevSwitchNames, | 2999 kWebRtcDevSwitchNames, |
| 3010 arraysize(kWebRtcDevSwitchNames)); | 3000 arraysize(kWebRtcDevSwitchNames)); |
| 3011 } | 3001 } |
| 3012 } | 3002 } |
| 3013 #endif // defined(ENABLE_WEBRTC) | 3003 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |