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

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

Issue 22810002: SyncFS: Reorder initialization sequence of SyncFileSystemService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 3 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 | « no previous file | chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h » ('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 2404 matching lines...) Expand 10 before | Expand all | Expand 10 after
2415 new chromeos::FileSystemBackend( 2415 new chromeos::FileSystemBackend(
2416 new drive::FileSystemBackendDelegate(browser_context), 2416 new drive::FileSystemBackendDelegate(browser_context),
2417 browser_context->GetSpecialStoragePolicy(), 2417 browser_context->GetSpecialStoragePolicy(),
2418 external_mount_points, 2418 external_mount_points,
2419 fileapi::ExternalMountPoints::GetSystemInstance()); 2419 fileapi::ExternalMountPoints::GetSystemInstance());
2420 backend->AddSystemMountPoints(); 2420 backend->AddSystemMountPoints();
2421 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); 2421 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal));
2422 additional_backends->push_back(backend); 2422 additional_backends->push_back(backend);
2423 #endif 2423 #endif
2424 2424
2425 additional_backends->push_back(new sync_file_system::SyncFileSystemBackend()); 2425 additional_backends->push_back(
2426 new sync_file_system::SyncFileSystemBackend(
2427 Profile::FromBrowserContext(browser_context)));
2426 } 2428 }
2427 2429
2428 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2430 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2429 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2431 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2430 const CommandLine& command_line, 2432 const CommandLine& command_line,
2431 int child_process_id, 2433 int child_process_id,
2432 std::vector<FileDescriptorInfo>* mappings) { 2434 std::vector<FileDescriptorInfo>* mappings) {
2433 #if defined(OS_ANDROID) 2435 #if defined(OS_ANDROID)
2434 base::FilePath data_path; 2436 base::FilePath data_path;
2435 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); 2437 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
2517 #if defined(USE_NSS) 2519 #if defined(USE_NSS)
2518 crypto::CryptoModuleBlockingPasswordDelegate* 2520 crypto::CryptoModuleBlockingPasswordDelegate*
2519 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2521 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2520 const GURL& url) { 2522 const GURL& url) {
2521 return chrome::NewCryptoModuleBlockingDialogDelegate( 2523 return chrome::NewCryptoModuleBlockingDialogDelegate(
2522 chrome::kCryptoModulePasswordKeygen, url.host()); 2524 chrome::kCryptoModulePasswordKeygen, url.host());
2523 } 2525 }
2524 #endif 2526 #endif
2525 2527
2526 } // namespace chrome 2528 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698