| Index: chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
|
| index c3af728e12624810275ebc6223b5725383d7acd3..670ad7780b8d001fc415733ad21be6debb5fcce0 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
|
| @@ -43,7 +43,7 @@ using content::ChildProcessSecurityPolicy;
|
| using content::WebContents;
|
| using fileapi::FileSystemURL;
|
|
|
| -namespace file_manager {
|
| +namespace extensions {
|
| namespace {
|
|
|
| // Error messages.
|
| @@ -72,7 +72,7 @@ base::DictionaryValue* CreateValueFromDisk(
|
| std::string mount_path;
|
| if (!volume->mount_path().empty()) {
|
| base::FilePath relative_mount_path;
|
| - util::ConvertAbsoluteFilePathToRelativeFileSystemPath(
|
| + file_manager::util::ConvertAbsoluteFilePathToRelativeFileSystemPath(
|
| profile, extension_id, base::FilePath(volume->mount_path()),
|
| &relative_mount_path);
|
| mount_path = relative_mount_path.value();
|
| @@ -110,7 +110,7 @@ void SetDriveMountPointPermissions(
|
| }
|
|
|
| fileapi::ExternalFileSystemBackend* backend =
|
| - util::GetFileSystemContextForRenderViewHost(
|
| + file_manager::util::GetFileSystemContextForRenderViewHost(
|
| profile, render_view_host)->external_backend();
|
| if (!backend)
|
| return;
|
| @@ -272,7 +272,7 @@ bool RequestFileSystemFunction::RunImpl() {
|
| set_log_on_completion(true);
|
|
|
| scoped_refptr<fileapi::FileSystemContext> file_system_context =
|
| - util::GetFileSystemContextForRenderViewHost(
|
| + file_manager::util::GetFileSystemContextForRenderViewHost(
|
| profile(), render_view_host());
|
|
|
| const GURL origin_url = source_url_.GetOrigin();
|
| @@ -311,7 +311,7 @@ bool FileWatchFunctionBase::RunImpl() {
|
| return false;
|
|
|
| scoped_refptr<fileapi::FileSystemContext> file_system_context =
|
| - util::GetFileSystemContextForRenderViewHost(
|
| + file_manager::util::GetFileSystemContextForRenderViewHost(
|
| profile(), render_view_host());
|
|
|
| FileSystemURL file_watch_url = file_system_context->CrackURL(GURL(url));
|
| @@ -338,8 +338,8 @@ void AddFileWatchFunction::PerformFileWatchOperation(
|
| const std::string& extension_id) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| - EventRouter* event_router =
|
| - FileBrowserPrivateAPI::Get(profile_)->event_router();
|
| + file_manager::EventRouter* event_router =
|
| + file_manager::FileBrowserPrivateAPI::Get(profile_)->event_router();
|
| event_router->AddFileWatch(
|
| local_path,
|
| virtual_path,
|
| @@ -359,8 +359,8 @@ void RemoveFileWatchFunction::PerformFileWatchOperation(
|
| const std::string& extension_id) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| - EventRouter* event_router =
|
| - FileBrowserPrivateAPI::Get(profile_)->event_router();
|
| + file_manager::EventRouter* event_router =
|
| + file_manager::FileBrowserPrivateAPI::Get(profile_)->event_router();
|
| event_router->RemoveFileWatch(local_path, extension_id);
|
| Respond(true);
|
| }
|
| @@ -386,7 +386,7 @@ bool SetLastModifiedFunction::RunImpl() {
|
| if (!args_->GetString(1, ×tamp))
|
| return false;
|
|
|
| - base::FilePath local_path = util::GetLocalPathFromURL(
|
| + base::FilePath local_path = file_manager::util::GetLocalPathFromURL(
|
| render_view_host(), profile(), GURL(file_url));
|
|
|
| base::PostTaskAndReplyWithResult(
|
| @@ -415,7 +415,7 @@ bool GetSizeStatsFunction::RunImpl() {
|
| if (!args_->GetString(0, &mount_url))
|
| return false;
|
|
|
| - base::FilePath file_path = util::GetLocalPathFromURL(
|
| + base::FilePath file_path = file_manager::util::GetLocalPathFromURL(
|
| render_view_host(), profile(), GURL(mount_url));
|
| if (file_path.empty())
|
| return false;
|
| @@ -500,7 +500,7 @@ bool GetVolumeMetadataFunction::RunImpl() {
|
| return false;
|
| }
|
|
|
| - base::FilePath file_path = util::GetLocalPathFromURL(
|
| + base::FilePath file_path = file_manager::util::GetLocalPathFromURL(
|
| render_view_host(), profile(), GURL(volume_mount_url));
|
| if (file_path.empty()) {
|
| error_ = "Invalid mount path.";
|
| @@ -536,7 +536,7 @@ bool ValidatePathNameLengthFunction::RunImpl() {
|
| return false;
|
|
|
| scoped_refptr<fileapi::FileSystemContext> file_system_context =
|
| - util::GetFileSystemContextForRenderViewHost(
|
| + file_manager::util::GetFileSystemContextForRenderViewHost(
|
| profile(), render_view_host());
|
|
|
| fileapi::FileSystemURL filesystem_url(
|
| @@ -585,7 +585,7 @@ bool FormatDeviceFunction::RunImpl() {
|
| return false;
|
| }
|
|
|
| - base::FilePath file_path = util::GetLocalPathFromURL(
|
| + base::FilePath file_path = file_manager::util::GetLocalPathFromURL(
|
| render_view_host(), profile(), GURL(volume_file_url));
|
| if (file_path.empty())
|
| return false;
|
| @@ -595,4 +595,4 @@ bool FormatDeviceFunction::RunImpl() {
|
| return true;
|
| }
|
|
|
| -} // namespace file_manager
|
| +} // namespace extensions
|
|
|