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 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1046 // Hosted apps that have script access to their background page must use | 1046 // Hosted apps that have script access to their background page must use |
1047 // process per site, since all instances can make synchronous calls to the | 1047 // process per site, since all instances can make synchronous calls to the |
1048 // background window. Other extensions should use process per site as well. | 1048 // background window. Other extensions should use process per site as well. |
1049 return true; | 1049 return true; |
1050 } | 1050 } |
1051 | 1051 |
1052 // These are treated as WebUI schemes but do not get WebUI bindings. | 1052 // These are treated as WebUI schemes but do not get WebUI bindings. |
1053 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( | 1053 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( |
1054 std::vector<std::string>* additional_schemes) { | 1054 std::vector<std::string>* additional_schemes) { |
1055 additional_schemes->push_back(chrome::kChromeSearchScheme); | 1055 additional_schemes->push_back(chrome::kChromeSearchScheme); |
| 1056 additional_schemes->push_back(chrome::kDomDistillerScheme); |
1056 } | 1057 } |
1057 | 1058 |
1058 net::URLRequestContextGetter* | 1059 net::URLRequestContextGetter* |
1059 ChromeContentBrowserClient::CreateRequestContext( | 1060 ChromeContentBrowserClient::CreateRequestContext( |
1060 content::BrowserContext* browser_context, | 1061 content::BrowserContext* browser_context, |
1061 content::ProtocolHandlerMap* protocol_handlers) { | 1062 content::ProtocolHandlerMap* protocol_handlers) { |
1062 Profile* profile = Profile::FromBrowserContext(browser_context); | 1063 Profile* profile = Profile::FromBrowserContext(browser_context); |
1063 return profile->CreateRequestContext(protocol_handlers); | 1064 return profile->CreateRequestContext(protocol_handlers); |
1064 } | 1065 } |
1065 | 1066 |
(...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2649 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, | 2650 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, |
2650 allowed_file_handle_origins_) || | 2651 allowed_file_handle_origins_) || |
2651 IsHostAllowedByCommandLine(url, extension_set, | 2652 IsHostAllowedByCommandLine(url, extension_set, |
2652 switches::kAllowNaClFileHandleAPI); | 2653 switches::kAllowNaClFileHandleAPI); |
2653 #else | 2654 #else |
2654 return false; | 2655 return false; |
2655 #endif | 2656 #endif |
2656 } | 2657 } |
2657 | 2658 |
2658 } // namespace chrome | 2659 } // namespace chrome |
OLD | NEW |