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

Unified Diff: trunk/src/chrome/browser/chromeos/file_system_provider/mount_path_util.cc

Issue 242113007: Revert 264780 "[fsp] Add FileSystemURLParser to the file system ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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
Index: trunk/src/chrome/browser/chromeos/file_system_provider/mount_path_util.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/file_system_provider/mount_path_util.cc (revision 264799)
+++ trunk/src/chrome/browser/chromeos/file_system_provider/mount_path_util.cc (working copy)
@@ -4,18 +4,11 @@
#include "chrome/browser/chromeos/file_system_provider/mount_path_util.h"
-#include <vector>
-
+#include "base/files/file_path.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/file_system_provider/provided_file_system.h"
-#include "chrome/browser/chromeos/file_system_provider/service.h"
#include "chrome/browser/chromeos/login/user.h"
#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
namespace chromeos {
namespace file_system_provider {
@@ -29,9 +22,9 @@
} // namespace
-base::FilePath GetMountPath(Profile* profile,
- std::string extension_id,
- int file_system_id) {
+base::FilePath GetMountPointPath(Profile* profile,
+ std::string extension_id,
+ int file_system_id) {
chromeos::User* const user =
chromeos::UserManager::IsInitialized()
? chromeos::UserManager::Get()->GetUserByProfile(
@@ -42,55 +35,6 @@
extension_id + "-" + base::IntToString(file_system_id) + user_suffix);
}
-FileSystemURLParser::FileSystemURLParser(const fileapi::FileSystemURL& url)
- : url_(url), file_system_(NULL) {}
-
-FileSystemURLParser::~FileSystemURLParser() {}
-
-bool FileSystemURLParser::Parse() {
- if (url_.type() != fileapi::kFileSystemTypeProvided)
- return false;
-
- // First, find the service handling the mount point of the URL.
- const std::vector<Profile*>& profiles =
- g_browser_process->profile_manager()->GetLoadedProfiles();
-
- for (size_t i = 0; i < profiles.size(); ++i) {
- Profile* original_profile = profiles[i]->GetOriginalProfile();
-
- if (original_profile != profiles[i] ||
- chromeos::ProfileHelper::IsSigninProfile(original_profile)) {
- continue;
- }
-
- Service* service = Service::Get(original_profile);
- if (!service)
- continue;
-
- ProvidedFileSystemInterface* file_system =
- service->GetProvidedFileSystem(url_.filesystem_id());
- if (!file_system)
- continue;
-
- // Strip the mount point name from the virtual path, to extract the file
- // path within the provided file system.
- file_system_ = file_system;
- std::vector<base::FilePath::StringType> components;
- url_.virtual_path().GetComponents(&components);
- DCHECK_LT(0u, components.size());
- file_path_ = base::FilePath();
- for (size_t i = 1; i < components.size(); ++i) {
- // TODO(mtomasz): This could be optimized, to avoid unnecessary copies.
- file_path_ = file_path_.Append(components[i]);
- }
-
- return true;
- }
-
- // Nothing has been found.
- return false;
-}
-
} // namespace util
} // namespace file_system_provider
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698