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 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1036 // Hosted apps that have script access to their background page must use | 1036 // Hosted apps that have script access to their background page must use |
1037 // process per site, since all instances can make synchronous calls to the | 1037 // process per site, since all instances can make synchronous calls to the |
1038 // background window. Other extensions should use process per site as well. | 1038 // background window. Other extensions should use process per site as well. |
1039 return true; | 1039 return true; |
1040 } | 1040 } |
1041 | 1041 |
1042 // These are treated as WebUI schemes but do not get WebUI bindings. | 1042 // These are treated as WebUI schemes but do not get WebUI bindings. |
1043 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( | 1043 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( |
1044 std::vector<std::string>* additional_schemes) { | 1044 std::vector<std::string>* additional_schemes) { |
1045 additional_schemes->push_back(chrome::kChromeSearchScheme); | 1045 additional_schemes->push_back(chrome::kChromeSearchScheme); |
| 1046 additional_schemes->push_back(chrome::kDomDistillerScheme); |
1046 } | 1047 } |
1047 | 1048 |
1048 net::URLRequestContextGetter* | 1049 net::URLRequestContextGetter* |
1049 ChromeContentBrowserClient::CreateRequestContext( | 1050 ChromeContentBrowserClient::CreateRequestContext( |
1050 content::BrowserContext* browser_context, | 1051 content::BrowserContext* browser_context, |
1051 content::ProtocolHandlerMap* protocol_handlers) { | 1052 content::ProtocolHandlerMap* protocol_handlers) { |
1052 Profile* profile = Profile::FromBrowserContext(browser_context); | 1053 Profile* profile = Profile::FromBrowserContext(browser_context); |
1053 return profile->CreateRequestContext(protocol_handlers); | 1054 return profile->CreateRequestContext(protocol_handlers); |
1054 } | 1055 } |
1055 | 1056 |
(...skipping 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2630 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, | 2631 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, |
2631 allowed_file_handle_origins_) || | 2632 allowed_file_handle_origins_) || |
2632 IsHostAllowedByCommandLine(url, extension_set, | 2633 IsHostAllowedByCommandLine(url, extension_set, |
2633 switches::kAllowNaClFileHandleAPI); | 2634 switches::kAllowNaClFileHandleAPI); |
2634 #else | 2635 #else |
2635 return false; | 2636 return false; |
2636 #endif | 2637 #endif |
2637 } | 2638 } |
2638 | 2639 |
2639 } // namespace chrome | 2640 } // namespace chrome |
OLD | NEW |