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

Unified 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, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chromeos/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 6e16a0b943b5b0717e432c000f521b9908acafc9..5dc842e682d64b8bdcf0b4ef4d05ee0396d0633a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -136,6 +136,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/message_center/message_center_util.h"
+#include "webkit/browser/fileapi/external_mount_points.h"
#include "webkit/common/webpreferences.h"
#include "webkit/plugins/plugin_switches.h"
@@ -147,6 +148,7 @@
#include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
#elif defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
+#include "chrome/browser/chromeos/fileapi/cros_mount_point_provider.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/system/statistics_provider.h"
@@ -2255,6 +2257,8 @@ void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders(
const base::FilePath& storage_partition_path,
+ quota::SpecialStoragePolicy* special_storage_policy,
+ fileapi::ExternalMountPoints* external_mount_points,
ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) {
#if !defined(OS_ANDROID)
base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
@@ -2263,6 +2267,17 @@ void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders(
pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get()));
#endif
+#if defined(OS_CHROMEOS)
+ DCHECK(external_mount_points);
+ chromeos::CrosMountPointProvider* cros_mount_provider =
+ new chromeos::CrosMountPointProvider(
+ special_storage_policy,
+ external_mount_points,
+ fileapi::ExternalMountPoints::GetSystemInstance());
+ cros_mount_provider->AddSystemMountPoints();
+ DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal));
+ additional_providers->push_back(cros_mount_provider);
+#endif
}
#if defined(OS_POSIX) && !defined(OS_MACOSX)
« 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