Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 17644006: Move files under webkit/browser/fileapi/... to chrome/browser/chromeos/fileapi/... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chromeos/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 #include "grit/ui_resources.h" 129 #include "grit/ui_resources.h"
130 #include "net/base/escape.h" 130 #include "net/base/escape.h"
131 #include "net/base/mime_util.h" 131 #include "net/base/mime_util.h"
132 #include "net/cookies/canonical_cookie.h" 132 #include "net/cookies/canonical_cookie.h"
133 #include "net/cookies/cookie_options.h" 133 #include "net/cookies/cookie_options.h"
134 #include "net/ssl/ssl_cert_request_info.h" 134 #include "net/ssl/ssl_cert_request_info.h"
135 #include "ppapi/host/ppapi_host.h" 135 #include "ppapi/host/ppapi_host.h"
136 #include "ui/base/l10n/l10n_util.h" 136 #include "ui/base/l10n/l10n_util.h"
137 #include "ui/base/resource/resource_bundle.h" 137 #include "ui/base/resource/resource_bundle.h"
138 #include "ui/message_center/message_center_util.h" 138 #include "ui/message_center/message_center_util.h"
139 #include "webkit/browser/fileapi/external_mount_points.h"
139 #include "webkit/common/webpreferences.h" 140 #include "webkit/common/webpreferences.h"
140 #include "webkit/plugins/plugin_switches.h" 141 #include "webkit/plugins/plugin_switches.h"
141 142
142 #if defined(OS_WIN) 143 #if defined(OS_WIN)
143 #include "chrome/browser/chrome_browser_main_win.h" 144 #include "chrome/browser/chrome_browser_main_win.h"
144 #include "sandbox/win/src/sandbox_policy.h" 145 #include "sandbox/win/src/sandbox_policy.h"
145 #elif defined(OS_MACOSX) 146 #elif defined(OS_MACOSX)
146 #include "chrome/browser/chrome_browser_main_mac.h" 147 #include "chrome/browser/chrome_browser_main_mac.h"
147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 148 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
148 #elif defined(OS_CHROMEOS) 149 #elif defined(OS_CHROMEOS)
149 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
151 #include "chrome/browser/chromeos/fileapi/cros_mount_point_provider.h"
150 #include "chrome/browser/chromeos/login/startup_utils.h" 152 #include "chrome/browser/chromeos/login/startup_utils.h"
151 #include "chrome/browser/chromeos/login/user_manager.h" 153 #include "chrome/browser/chromeos/login/user_manager.h"
152 #include "chrome/browser/chromeos/system/statistics_provider.h" 154 #include "chrome/browser/chromeos/system/statistics_provider.h"
153 #include "chromeos/chromeos_switches.h" 155 #include "chromeos/chromeos_switches.h"
154 #elif defined(OS_LINUX) 156 #elif defined(OS_LINUX)
155 #include "chrome/browser/chrome_browser_main_linux.h" 157 #include "chrome/browser/chrome_browser_main_linux.h"
156 #elif defined(OS_ANDROID) 158 #elif defined(OS_ANDROID)
157 #include "chrome/browser/android/crash_dump_manager.h" 159 #include "chrome/browser/android/crash_dump_manager.h"
158 #include "chrome/browser/chrome_browser_main_android.h" 160 #include "chrome/browser/chrome_browser_main_android.h"
159 #include "chrome/common/descriptors_android.h" 161 #include "chrome/common/descriptors_android.h"
(...skipping 2088 matching lines...) Expand 10 before | Expand all | Expand 10 after
2248 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2250 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2249 std::vector<std::string>* additional_allowed_schemes) { 2251 std::vector<std::string>* additional_allowed_schemes) {
2250 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2252 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2251 additional_allowed_schemes); 2253 additional_allowed_schemes);
2252 additional_allowed_schemes->push_back(kChromeUIScheme); 2254 additional_allowed_schemes->push_back(kChromeUIScheme);
2253 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2255 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2254 } 2256 }
2255 2257
2256 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders( 2258 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders(
2257 const base::FilePath& storage_partition_path, 2259 const base::FilePath& storage_partition_path,
2260 quota::SpecialStoragePolicy* special_storage_policy,
2261 fileapi::ExternalMountPoints* external_mount_points,
2258 ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) { 2262 ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) {
2259 #if !defined(OS_ANDROID) 2263 #if !defined(OS_ANDROID)
2260 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); 2264 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2261 additional_providers->push_back(new MediaFileSystemMountPointProvider( 2265 additional_providers->push_back(new MediaFileSystemMountPointProvider(
2262 storage_partition_path, 2266 storage_partition_path,
2263 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( 2267 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
2264 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); 2268 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get()));
2265 #endif 2269 #endif
2270 #if defined(OS_CHROMEOS)
2271 DCHECK(external_mount_points);
2272 chromeos::CrosMountPointProvider* cros_mount_provider =
2273 new chromeos::CrosMountPointProvider(
2274 special_storage_policy,
2275 external_mount_points,
2276 fileapi::ExternalMountPoints::GetSystemInstance());
2277 cros_mount_provider->AddSystemMountPoints();
2278 DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal));
2279 additional_providers->push_back(cros_mount_provider);
2280 #endif
2266 } 2281 }
2267 2282
2268 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2283 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2269 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2284 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2270 const CommandLine& command_line, 2285 const CommandLine& command_line,
2271 int child_process_id, 2286 int child_process_id,
2272 std::vector<FileDescriptorInfo>* mappings) { 2287 std::vector<FileDescriptorInfo>* mappings) {
2273 #if defined(OS_ANDROID) 2288 #if defined(OS_ANDROID)
2274 base::FilePath data_path; 2289 base::FilePath data_path;
2275 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); 2290 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
2365 #if defined(USE_NSS) 2380 #if defined(USE_NSS)
2366 crypto::CryptoModuleBlockingPasswordDelegate* 2381 crypto::CryptoModuleBlockingPasswordDelegate*
2367 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2382 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2368 const GURL& url) { 2383 const GURL& url) {
2369 return chrome::NewCryptoModuleBlockingDialogDelegate( 2384 return chrome::NewCryptoModuleBlockingDialogDelegate(
2370 chrome::kCryptoModulePasswordKeygen, url.host()); 2385 chrome::kCryptoModulePasswordKeygen, url.host());
2371 } 2386 }
2372 #endif 2387 #endif
2373 2388
2374 } // namespace chrome 2389 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chromeos/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698