Chromium Code Reviews| 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 25 matching lines...) Expand all Loading... | |
| 36 #include "chrome/browser/extensions/extension_info_map.h" | 36 #include "chrome/browser/extensions/extension_info_map.h" |
| 37 #include "chrome/browser/extensions/extension_process_manager.h" | 37 #include "chrome/browser/extensions/extension_process_manager.h" |
| 38 #include "chrome/browser/extensions/extension_service.h" | 38 #include "chrome/browser/extensions/extension_service.h" |
| 39 #include "chrome/browser/extensions/extension_system.h" | 39 #include "chrome/browser/extensions/extension_system.h" |
| 40 #include "chrome/browser/extensions/extension_web_ui.h" | 40 #include "chrome/browser/extensions/extension_web_ui.h" |
| 41 #include "chrome/browser/extensions/extension_webkit_preferences.h" | 41 #include "chrome/browser/extensions/extension_webkit_preferences.h" |
| 42 #include "chrome/browser/extensions/suggest_permission_util.h" | 42 #include "chrome/browser/extensions/suggest_permission_util.h" |
| 43 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 43 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
| 44 #include "chrome/browser/google/google_util.h" | 44 #include "chrome/browser/google/google_util.h" |
| 45 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 45 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 46 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p rovider.h" | |
| 46 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 47 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
| 47 #include "chrome/browser/nacl_host/nacl_process_host.h" | 48 #include "chrome/browser/nacl_host/nacl_process_host.h" |
| 48 #include "chrome/browser/net/chrome_net_log.h" | 49 #include "chrome/browser/net/chrome_net_log.h" |
| 49 #include "chrome/browser/notifications/desktop_notification_service.h" | 50 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 50 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 51 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
| 51 #include "chrome/browser/platform_util.h" | 52 #include "chrome/browser/platform_util.h" |
| 52 #include "chrome/browser/plugins/plugin_info_message_filter.h" | 53 #include "chrome/browser/plugins/plugin_info_message_filter.h" |
| 53 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 54 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 54 #include "chrome/browser/prerender/prerender_manager.h" | 55 #include "chrome/browser/prerender/prerender_manager.h" |
| 55 #include "chrome/browser/prerender/prerender_manager_factory.h" | 56 #include "chrome/browser/prerender/prerender_manager_factory.h" |
| (...skipping 2046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2102 } | 2103 } |
| 2103 | 2104 |
| 2104 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( | 2105 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( |
| 2105 std::vector<std::string>* additional_allowed_schemes) { | 2106 std::vector<std::string>* additional_allowed_schemes) { |
| 2106 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( | 2107 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( |
| 2107 additional_allowed_schemes); | 2108 additional_allowed_schemes); |
| 2108 additional_allowed_schemes->push_back(kChromeUIScheme); | 2109 additional_allowed_schemes->push_back(kChromeUIScheme); |
| 2109 additional_allowed_schemes->push_back(extensions::kExtensionScheme); | 2110 additional_allowed_schemes->push_back(extensions::kExtensionScheme); |
| 2110 } | 2111 } |
| 2111 | 2112 |
| 2113 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders( | |
| 2114 const base::FilePath& partition_path, | |
| 2115 ScopedVector<fileapi::FileSystemMountPointProvider>* | |
| 2116 additional_providers) { | |
|
vandebo (ex-Chrome)
2013/04/22 22:32:28
nit: fits on previous line.
tommycli
2013/04/22 23:45:31
Done.
| |
| 2117 DCHECK(additional_providers); | |
| 2118 | |
| 2119 additional_providers->push_back(new MediaFileSystemMountPointProvider( | |
| 2120 partition_path)); | |
| 2121 } | |
| 2122 | |
| 2112 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 2123 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 2113 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( | 2124 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
| 2114 const CommandLine& command_line, | 2125 const CommandLine& command_line, |
| 2115 int child_process_id, | 2126 int child_process_id, |
| 2116 std::vector<FileDescriptorInfo>* mappings) { | 2127 std::vector<FileDescriptorInfo>* mappings) { |
| 2117 #if defined(OS_ANDROID) | 2128 #if defined(OS_ANDROID) |
| 2118 base::FilePath data_path; | 2129 base::FilePath data_path; |
| 2119 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); | 2130 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); |
| 2120 DCHECK(!data_path.empty()); | 2131 DCHECK(!data_path.empty()); |
| 2121 | 2132 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2209 #if defined(USE_NSS) | 2220 #if defined(USE_NSS) |
| 2210 crypto::CryptoModuleBlockingPasswordDelegate* | 2221 crypto::CryptoModuleBlockingPasswordDelegate* |
| 2211 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2222 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 2212 const GURL& url) { | 2223 const GURL& url) { |
| 2213 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2224 return chrome::NewCryptoModuleBlockingDialogDelegate( |
| 2214 chrome::kCryptoModulePasswordKeygen, url.host()); | 2225 chrome::kCryptoModulePasswordKeygen, url.host()); |
| 2215 } | 2226 } |
| 2216 #endif | 2227 #endif |
| 2217 | 2228 |
| 2218 } // namespace chrome | 2229 } // namespace chrome |
| OLD | NEW |