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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 } | 813 } |
814 } | 814 } |
815 | 815 |
816 // Hosted apps that have script access to their background page must use | 816 // Hosted apps that have script access to their background page must use |
817 // process per site, since all instances can make synchronous calls to the | 817 // process per site, since all instances can make synchronous calls to the |
818 // background window. Other extensions should use process per site as well. | 818 // background window. Other extensions should use process per site as well. |
819 return true; | 819 return true; |
820 } | 820 } |
821 | 821 |
822 // These are treated as WebUI schemes but do not get WebUI bindings. | 822 // These are treated as WebUI schemes but do not get WebUI bindings. |
823 std::vector<std::string> | 823 void ChromeContentBrowserClient::GetAdditionalWebUISchemes( |
824 ChromeContentBrowserClient::GetAdditionalWebUISchemes() { | 824 std::vector<std::string>* additional_schemes) { |
825 std::vector<std::string> additional_schemes; | 825 additional_schemes->push_back(chrome::kChromeSearchScheme); |
826 additional_schemes.push_back(chrome::kChromeSearchScheme); | |
827 return additional_schemes; | |
828 } | 826 } |
829 | 827 |
830 net::URLRequestContextGetter* | 828 net::URLRequestContextGetter* |
831 ChromeContentBrowserClient::CreateRequestContext( | 829 ChromeContentBrowserClient::CreateRequestContext( |
832 content::BrowserContext* browser_context, | 830 content::BrowserContext* browser_context, |
833 content::ProtocolHandlerMap* protocol_handlers) { | 831 content::ProtocolHandlerMap* protocol_handlers) { |
834 Profile* profile = Profile::FromBrowserContext(browser_context); | 832 Profile* profile = Profile::FromBrowserContext(browser_context); |
835 return profile->CreateRequestContext(protocol_handlers); | 833 return profile->CreateRequestContext(protocol_handlers); |
836 } | 834 } |
837 | 835 |
(...skipping 1358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2196 #if defined(USE_NSS) | 2194 #if defined(USE_NSS) |
2197 crypto::CryptoModuleBlockingPasswordDelegate* | 2195 crypto::CryptoModuleBlockingPasswordDelegate* |
2198 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2196 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2199 const GURL& url) { | 2197 const GURL& url) { |
2200 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2198 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2201 chrome::kCryptoModulePasswordKeygen, url.host()); | 2199 chrome::kCryptoModulePasswordKeygen, url.host()); |
2202 } | 2200 } |
2203 #endif | 2201 #endif |
2204 | 2202 |
2205 } // namespace chrome | 2203 } // namespace chrome |
OLD | NEW |