Index: chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc |
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc |
index fb30207249aaa9614003dcc193912b1c3374c1dd..a8b4fd1aa2dbb5b9d86136150442a15a39ecdd12 100644 |
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc |
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc |
@@ -15,7 +15,7 @@ |
#include "chrome/browser/chromeos/file_manager/volume_manager.h" |
#include "chrome/browser/drive/event_logger.h" |
#include "chrome/browser/profiles/profile.h" |
-#include "chrome/common/extensions/api/file_browser_private.h" |
+#include "chrome/common/extensions/api/file_manager_private.h" |
#include "chromeos/disks/disk_mount_manager.h" |
#include "content/public/browser/browser_thread.h" |
#include "google_apis/drive/task_util.h" |
@@ -23,7 +23,7 @@ |
using chromeos::disks::DiskMountManager; |
using content::BrowserThread; |
-namespace file_browser_private = extensions::api::file_browser_private; |
+namespace file_manager_private = extensions::api::file_manager_private; |
namespace extensions { |
@@ -45,8 +45,8 @@ void EnsureReadableFilePermissionOnBlockingPool( |
} // namespace |
-bool FileBrowserPrivateAddMountFunction::RunAsync() { |
- using file_browser_private::AddMount::Params; |
+bool FileManagerPrivateAddMountFunction::RunAsync() { |
+ using file_manager_private::AddMount::Params; |
const scoped_ptr<Params> params(Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params); |
@@ -76,7 +76,7 @@ bool FileBrowserPrivateAddMountFunction::RunAsync() { |
file_system->MarkCacheFileAsMounted( |
drive::util::ExtractDrivePath(path), |
base::Bind( |
- &FileBrowserPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted, |
+ &FileManagerPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted, |
this, path.BaseName())); |
} else { |
file_manager::VolumeManager* volume_manager = |
@@ -102,7 +102,7 @@ bool FileBrowserPrivateAddMountFunction::RunAsync() { |
base::Bind(&EnsureReadableFilePermissionOnBlockingPool, |
path, |
google_apis::CreateRelayCallback( |
- base::Bind(&FileBrowserPrivateAddMountFunction:: |
+ base::Bind(&FileManagerPrivateAddMountFunction:: |
RunAfterMarkCacheFileAsMounted, |
this, |
path.BaseName())))); |
@@ -114,7 +114,7 @@ bool FileBrowserPrivateAddMountFunction::RunAsync() { |
return true; |
} |
-void FileBrowserPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted( |
+void FileManagerPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted( |
const base::FilePath& display_name, |
drive::FileError error, |
const base::FilePath& file_path) { |
@@ -138,8 +138,8 @@ void FileBrowserPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted( |
chromeos::MOUNT_TYPE_ARCHIVE); |
} |
-bool FileBrowserPrivateRemoveMountFunction::RunAsync() { |
- using file_browser_private::RemoveMount::Params; |
+bool FileManagerPrivateRemoveMountFunction::RunAsync() { |
+ using file_manager_private::RemoveMount::Params; |
const scoped_ptr<Params> params(Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params); |
@@ -194,7 +194,7 @@ bool FileBrowserPrivateRemoveMountFunction::RunAsync() { |
return true; |
} |
-bool FileBrowserPrivateGetVolumeMetadataListFunction::RunAsync() { |
+bool FileManagerPrivateGetVolumeMetadataListFunction::RunAsync() { |
if (args_->GetSize()) |
return false; |
@@ -202,10 +202,10 @@ bool FileBrowserPrivateGetVolumeMetadataListFunction::RunAsync() { |
file_manager::VolumeManager::Get(GetProfile())->GetVolumeInfoList(); |
std::string log_string; |
- std::vector<linked_ptr<file_browser_private::VolumeMetadata> > result; |
+ std::vector<linked_ptr<file_manager_private::VolumeMetadata> > result; |
for (size_t i = 0; i < volume_info_list.size(); ++i) { |
- linked_ptr<file_browser_private::VolumeMetadata> volume_metadata( |
- new file_browser_private::VolumeMetadata); |
+ linked_ptr<file_manager_private::VolumeMetadata> volume_metadata( |
+ new file_manager_private::VolumeMetadata); |
file_manager::util::VolumeInfoToVolumeMetadata( |
GetProfile(), volume_info_list[i], volume_metadata.get()); |
result.push_back(volume_metadata); |
@@ -223,7 +223,7 @@ bool FileBrowserPrivateGetVolumeMetadataListFunction::RunAsync() { |
} |
results_ = |
- file_browser_private::GetVolumeMetadataList::Results::Create(result); |
+ file_manager_private::GetVolumeMetadataList::Results::Create(result); |
SendResponse(true); |
return true; |
} |