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

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

Issue 442383002: Move storage-related files from webkit/ to new top-level directory storage/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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
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/generated_resources.h" 129 #include "grit/generated_resources.h"
130 #include "grit/ui_resources.h" 130 #include "grit/ui_resources.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 "ppapi/shared_impl/ppapi_switches.h" 136 #include "ppapi/shared_impl/ppapi_switches.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 "webkit/browser/fileapi/external_mount_points.h" 139 #include "storage/browser/fileapi/external_mount_points.h"
140 140
141 #if defined(OS_WIN) 141 #if defined(OS_WIN)
142 #include "base/win/windows_version.h" 142 #include "base/win/windows_version.h"
143 #include "chrome/browser/chrome_browser_main_win.h" 143 #include "chrome/browser/chrome_browser_main_win.h"
144 #include "sandbox/win/src/sandbox_policy.h" 144 #include "sandbox/win/src/sandbox_policy.h"
145 #elif defined(OS_MACOSX) 145 #elif defined(OS_MACOSX)
146 #include "chrome/browser/chrome_browser_main_mac.h" 146 #include "chrome/browser/chrome_browser_main_mac.h"
147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
148 #include "components/breakpad/app/breakpad_mac.h" 148 #include "components/breakpad/app/breakpad_mac.h"
149 #elif defined(OS_CHROMEOS) 149 #elif defined(OS_CHROMEOS)
(...skipping 2249 matching lines...) Expand 10 before | Expand all | Expand 10 after
2399 additional_allowed_schemes); 2399 additional_allowed_schemes);
2400 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); 2400 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
2401 additional_allowed_schemes->push_back(content::kChromeUIScheme); 2401 additional_allowed_schemes->push_back(content::kChromeUIScheme);
2402 for (size_t i = 0; i < extra_parts_.size(); ++i) { 2402 for (size_t i = 0; i < extra_parts_.size(); ++i) {
2403 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem( 2403 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem(
2404 additional_allowed_schemes); 2404 additional_allowed_schemes);
2405 } 2405 }
2406 } 2406 }
2407 2407
2408 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2408 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2409 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) { 2409 std::vector<storage::URLRequestAutoMountHandler>* handlers) {
2410 for (size_t i = 0; i < extra_parts_.size(); ++i) 2410 for (size_t i = 0; i < extra_parts_.size(); ++i)
2411 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); 2411 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers);
2412 } 2412 }
2413 2413
2414 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2414 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2415 content::BrowserContext* browser_context, 2415 content::BrowserContext* browser_context,
2416 const base::FilePath& storage_partition_path, 2416 const base::FilePath& storage_partition_path,
2417 ScopedVector<fileapi::FileSystemBackend>* additional_backends) { 2417 ScopedVector<storage::FileSystemBackend>* additional_backends) {
2418 #if defined(OS_CHROMEOS) 2418 #if defined(OS_CHROMEOS)
2419 fileapi::ExternalMountPoints* external_mount_points = 2419 storage::ExternalMountPoints* external_mount_points =
2420 content::BrowserContext::GetMountPoints(browser_context); 2420 content::BrowserContext::GetMountPoints(browser_context);
2421 DCHECK(external_mount_points); 2421 DCHECK(external_mount_points);
2422 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( 2422 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend(
2423 new drive::FileSystemBackendDelegate, 2423 new drive::FileSystemBackendDelegate,
2424 new chromeos::file_system_provider::BackendDelegate, 2424 new chromeos::file_system_provider::BackendDelegate,
2425 new chromeos::MTPFileSystemBackendDelegate(storage_partition_path), 2425 new chromeos::MTPFileSystemBackendDelegate(storage_partition_path),
2426 browser_context->GetSpecialStoragePolicy(), 2426 browser_context->GetSpecialStoragePolicy(),
2427 external_mount_points, 2427 external_mount_points,
2428 fileapi::ExternalMountPoints::GetSystemInstance()); 2428 storage::ExternalMountPoints::GetSystemInstance());
2429 backend->AddSystemMountPoints(); 2429 backend->AddSystemMountPoints();
2430 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); 2430 DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal));
2431 additional_backends->push_back(backend); 2431 additional_backends->push_back(backend);
2432 #endif 2432 #endif
2433 2433
2434 #if defined(ENABLE_SERVICE_DISCOVERY) 2434 #if defined(ENABLE_SERVICE_DISCOVERY)
2435 if (CommandLine::ForCurrentProcess()->HasSwitch( 2435 if (CommandLine::ForCurrentProcess()->HasSwitch(
2436 switches::kEnablePrivetStorage)) { 2436 switches::kEnablePrivetStorage)) {
2437 additional_backends->push_back( 2437 additional_backends->push_back(new local_discovery::PrivetFileSystemBackend(
2438 new local_discovery::PrivetFileSystemBackend( 2438 storage::ExternalMountPoints::GetSystemInstance(), browser_context));
2439 fileapi::ExternalMountPoints::GetSystemInstance(),
2440 browser_context));
2441 } 2439 }
2442 #endif 2440 #endif
2443 2441
2444 for (size_t i = 0; i < extra_parts_.size(); ++i) { 2442 for (size_t i = 0; i < extra_parts_.size(); ++i) {
2445 extra_parts_[i]->GetAdditionalFileSystemBackends( 2443 extra_parts_[i]->GetAdditionalFileSystemBackends(
2446 browser_context, storage_partition_path, additional_backends); 2444 browser_context, storage_partition_path, additional_backends);
2447 } 2445 }
2448 } 2446 }
2449 2447
2450 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2448 #if defined(OS_POSIX) && !defined(OS_MACOSX)
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
2639 switches::kDisableWebRtcEncryption, 2637 switches::kDisableWebRtcEncryption,
2640 }; 2638 };
2641 to_command_line->CopySwitchesFrom(from_command_line, 2639 to_command_line->CopySwitchesFrom(from_command_line,
2642 kWebRtcDevSwitchNames, 2640 kWebRtcDevSwitchNames,
2643 arraysize(kWebRtcDevSwitchNames)); 2641 arraysize(kWebRtcDevSwitchNames));
2644 } 2642 }
2645 } 2643 }
2646 #endif // defined(ENABLE_WEBRTC) 2644 #endif // defined(ENABLE_WEBRTC)
2647 2645
2648 } // namespace chrome 2646 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chrome_content_browser_client_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698