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

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

Issue 18668003: SyncFS: Introduce SyncFileSystemBackend (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase fix Created 7 years, 4 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 | webkit/browser/fileapi/file_system_context.cc » ('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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 #include "net/base/escape.h" 131 #include "net/base/escape.h"
132 #include "net/base/mime_util.h" 132 #include "net/base/mime_util.h"
133 #include "net/cookies/canonical_cookie.h" 133 #include "net/cookies/canonical_cookie.h"
134 #include "net/cookies/cookie_options.h" 134 #include "net/cookies/cookie_options.h"
135 #include "net/ssl/ssl_cert_request_info.h" 135 #include "net/ssl/ssl_cert_request_info.h"
136 #include "ppapi/host/ppapi_host.h" 136 #include "ppapi/host/ppapi_host.h"
137 #include "ui/base/l10n/l10n_util.h" 137 #include "ui/base/l10n/l10n_util.h"
138 #include "ui/base/resource/resource_bundle.h" 138 #include "ui/base/resource/resource_bundle.h"
139 #include "ui/message_center/message_center_util.h" 139 #include "ui/message_center/message_center_util.h"
140 #include "webkit/browser/fileapi/external_mount_points.h" 140 #include "webkit/browser/fileapi/external_mount_points.h"
141 #include "webkit/browser/fileapi/syncable/sync_file_system_backend.h"
141 #include "webkit/common/webpreferences.h" 142 #include "webkit/common/webpreferences.h"
142 #include "webkit/plugins/plugin_switches.h" 143 #include "webkit/plugins/plugin_switches.h"
143 144
144 #if defined(OS_WIN) 145 #if defined(OS_WIN)
145 #include "chrome/browser/chrome_browser_main_win.h" 146 #include "chrome/browser/chrome_browser_main_win.h"
146 #include "sandbox/win/src/sandbox_policy.h" 147 #include "sandbox/win/src/sandbox_policy.h"
147 #elif defined(OS_MACOSX) 148 #elif defined(OS_MACOSX)
148 #include "chrome/browser/chrome_browser_main_mac.h" 149 #include "chrome/browser/chrome_browser_main_mac.h"
149 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 150 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
150 #elif defined(OS_CHROMEOS) 151 #elif defined(OS_CHROMEOS)
(...skipping 2298 matching lines...) Expand 10 before | Expand all | Expand 10 after
2449 chromeos::FileSystemBackend* backend = 2450 chromeos::FileSystemBackend* backend =
2450 new chromeos::FileSystemBackend( 2451 new chromeos::FileSystemBackend(
2451 new drive::FileSystemBackendDelegate(browser_context), 2452 new drive::FileSystemBackendDelegate(browser_context),
2452 browser_context->GetSpecialStoragePolicy(), 2453 browser_context->GetSpecialStoragePolicy(),
2453 external_mount_points, 2454 external_mount_points,
2454 fileapi::ExternalMountPoints::GetSystemInstance()); 2455 fileapi::ExternalMountPoints::GetSystemInstance());
2455 backend->AddSystemMountPoints(); 2456 backend->AddSystemMountPoints();
2456 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); 2457 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal));
2457 additional_backends->push_back(backend); 2458 additional_backends->push_back(backend);
2458 #endif 2459 #endif
2460
2461 additional_backends->push_back(new sync_file_system::SyncFileSystemBackend());
2459 } 2462 }
2460 2463
2461 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2464 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2462 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2465 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2463 const CommandLine& command_line, 2466 const CommandLine& command_line,
2464 int child_process_id, 2467 int child_process_id,
2465 std::vector<FileDescriptorInfo>* mappings) { 2468 std::vector<FileDescriptorInfo>* mappings) {
2466 #if defined(OS_ANDROID) 2469 #if defined(OS_ANDROID)
2467 base::FilePath data_path; 2470 base::FilePath data_path;
2468 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); 2471 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
2556 #if defined(USE_NSS) 2559 #if defined(USE_NSS)
2557 crypto::CryptoModuleBlockingPasswordDelegate* 2560 crypto::CryptoModuleBlockingPasswordDelegate*
2558 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2561 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2559 const GURL& url) { 2562 const GURL& url) {
2560 return chrome::NewCryptoModuleBlockingDialogDelegate( 2563 return chrome::NewCryptoModuleBlockingDialogDelegate(
2561 chrome::kCryptoModulePasswordKeygen, url.host()); 2564 chrome::kCryptoModulePasswordKeygen, url.host());
2562 } 2565 }
2563 #endif 2566 #endif
2564 2567
2565 } // namespace chrome 2568 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | webkit/browser/fileapi/file_system_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698