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

Unified Diff: chrome/browser/extensions/extension_file_browser_private_api.cc

Issue 7174002: Change {Obfuscated|Local}FileSystemFileUtil non-Singleton to take an underlying *FileUtil. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebased. Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/chromeos/fileapi/cros_mount_point_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_file_browser_private_api.cc
diff --git a/chrome/browser/extensions/extension_file_browser_private_api.cc b/chrome/browser/extensions/extension_file_browser_private_api.cc
index 7ec9adf7bb658361ed5b73bb48ceb067cbc02dae..8367482a4139792410c56f1176906ad17e7b138a 100644
--- a/chrome/browser/extensions/extension_file_browser_private_api.cc
+++ b/chrome/browser/extensions/extension_file_browser_private_api.cc
@@ -47,7 +47,6 @@
#include "webkit/fileapi/file_system_types.h"
#include "webkit/fileapi/file_system_util.h"
#include "webkit/fileapi/file_system_file_util.h"
-#include "webkit/fileapi/local_file_system_file_util.h"
#include "ui/base/l10n/l10n_util.h"
#ifdef OS_CHROMEOS
@@ -651,12 +650,17 @@ class ExecuteTasksFileSystemCallbackDispatcher
false); // create
FilePath final_file_path = root_path.Append(virtual_path);
+ fileapi::ExternalFileSystemMountPointProvider* external_provider =
+ path_manager->external_provider();
+ if (!external_provider)
+ return false;
+
// Check if this file system entry exists first.
base::PlatformFileInfo file_info;
FilePath platform_path;
fileapi::FileSystemOperationContext file_system_operation_context(
profile_->GetFileSystemContext(),
- fileapi::LocalFileSystemFileUtil::GetInstance());
+ external_provider->GetFileSystemFileUtil());
if (base::PLATFORM_FILE_OK !=
fileapi::FileSystemFileUtil::GetInstance()->GetFileInfo(
&file_system_operation_context, final_file_path, &file_info,
@@ -664,11 +668,6 @@ class ExecuteTasksFileSystemCallbackDispatcher
return false;
}
- fileapi::ExternalFileSystemMountPointProvider* external_provider =
- path_manager->external_provider();
- if (!external_provider)
- return false;
-
// TODO(zelidrag): Let's just prevent all symlinks for now. We don't want a
// USB drive content to point to something in the rest of the file system.
// Ideally, we should permit symlinks within the boundary of the same
« no previous file with comments | « no previous file | webkit/chromeos/fileapi/cros_mount_point_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698