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 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1039 // Hosted apps that have script access to their background page must use | 1039 // Hosted apps that have script access to their background page must use |
1040 // process per site, since all instances can make synchronous calls to the | 1040 // process per site, since all instances can make synchronous calls to the |
1041 // background window. Other extensions should use process per site as well. | 1041 // background window. Other extensions should use process per site as well. |
1042 return true; | 1042 return true; |
1043 } | 1043 } |
1044 | 1044 |
1045 // These are treated as WebUI schemes but do not get WebUI bindings. | 1045 // These are treated as WebUI schemes but do not get WebUI bindings. |
1046 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( | 1046 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( |
1047 std::vector<std::string>* additional_schemes) { | 1047 std::vector<std::string>* additional_schemes) { |
1048 additional_schemes->push_back(chrome::kChromeSearchScheme); | 1048 additional_schemes->push_back(chrome::kChromeSearchScheme); |
| 1049 additional_schemes->push_back(chrome::kDomDistillerScheme); |
1049 } | 1050 } |
1050 | 1051 |
1051 net::URLRequestContextGetter* | 1052 net::URLRequestContextGetter* |
1052 ChromeContentBrowserClient::CreateRequestContext( | 1053 ChromeContentBrowserClient::CreateRequestContext( |
1053 content::BrowserContext* browser_context, | 1054 content::BrowserContext* browser_context, |
1054 content::ProtocolHandlerMap* protocol_handlers) { | 1055 content::ProtocolHandlerMap* protocol_handlers) { |
1055 Profile* profile = Profile::FromBrowserContext(browser_context); | 1056 Profile* profile = Profile::FromBrowserContext(browser_context); |
1056 return profile->CreateRequestContext(protocol_handlers); | 1057 return profile->CreateRequestContext(protocol_handlers); |
1057 } | 1058 } |
1058 | 1059 |
(...skipping 1595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2654 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on | 2655 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on |
2655 // Chromium builds as well. | 2656 // Chromium builds as well. |
2656 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 2657 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
2657 #else | 2658 #else |
2658 return false; | 2659 return false; |
2659 #endif | 2660 #endif |
2660 } | 2661 } |
2661 | 2662 |
2662 | 2663 |
2663 } // namespace chrome | 2664 } // namespace chrome |
OLD | NEW |