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