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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/extensions/file_manager/event_router.cc

Issue 550863003: Rename fileBrowserPrivate to fileManagerPrivate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/chromeos/extensions/file_manager/event_router.h ('k') | chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/file_manager/event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
index 633013797ddba366e537ca107e8c412d031b806b..951cb73241b81d4bb678712cac78ee73a3fba1fb 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -56,7 +56,7 @@ using drive::DriveIntegrationServiceFactory;
using file_manager::util::EntryDefinition;
using file_manager::util::FileDefinition;
-namespace file_browser_private = extensions::api::file_browser_private;
+namespace file_manager_private = extensions::api::file_manager_private;
namespace file_manager {
namespace {
@@ -100,18 +100,18 @@ void JobInfoToTransferStatus(
const std::string& extension_id,
const std::string& job_status,
const drive::JobInfo& job_info,
- file_browser_private::FileTransferStatus* status) {
+ file_manager_private::FileTransferStatus* status) {
DCHECK(IsActiveFileTransferJobInfo(job_info));
scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
GURL url = util::ConvertDrivePathToFileSystemUrl(
profile, job_info.file_path, extension_id);
status->file_url = url.spec();
- status->transfer_state = file_browser_private::ParseTransferState(job_status);
+ status->transfer_state = file_manager_private::ParseTransferState(job_status);
status->transfer_type =
IsUploadJob(job_info.job_type) ?
- file_browser_private::TRANSFER_TYPE_UPLOAD :
- file_browser_private::TRANSFER_TYPE_DOWNLOAD;
+ file_manager_private::TRANSFER_TYPE_UPLOAD :
+ file_manager_private::TRANSFER_TYPE_DOWNLOAD;
DriveIntegrationService* const integration_service =
DriveIntegrationServiceFactory::FindForProfile(profile);
status->num_total_jobs = CountActiveFileTransferJobInfo(
@@ -155,93 +155,93 @@ void BroadcastEvent(Profile* profile,
make_scoped_ptr(new extensions::Event(event_name, event_args.Pass())));
}
-file_browser_private::MountCompletedStatus
+file_manager_private::MountCompletedStatus
MountErrorToMountCompletedStatus(chromeos::MountError error) {
switch (error) {
case chromeos::MOUNT_ERROR_NONE:
- return file_browser_private::MOUNT_COMPLETED_STATUS_SUCCESS;
+ return file_manager_private::MOUNT_COMPLETED_STATUS_SUCCESS;
case chromeos::MOUNT_ERROR_UNKNOWN:
- return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_UNKNOWN;
+ return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_UNKNOWN;
case chromeos::MOUNT_ERROR_INTERNAL:
- return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_INTERNAL;
+ return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_INTERNAL;
case chromeos::MOUNT_ERROR_INVALID_ARGUMENT:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_INVALID_ARGUMENT;
case chromeos::MOUNT_ERROR_INVALID_PATH:
- return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_INVALID_PATH;
+ return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_INVALID_PATH;
case chromeos::MOUNT_ERROR_PATH_ALREADY_MOUNTED:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_PATH_ALREADY_MOUNTED;
case chromeos::MOUNT_ERROR_PATH_NOT_MOUNTED:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_PATH_NOT_MOUNTED;
case chromeos::MOUNT_ERROR_DIRECTORY_CREATION_FAILED:
- return file_browser_private
+ return file_manager_private
::MOUNT_COMPLETED_STATUS_ERROR_DIRECTORY_CREATION_FAILED;
case chromeos::MOUNT_ERROR_INVALID_MOUNT_OPTIONS:
- return file_browser_private
+ return file_manager_private
::MOUNT_COMPLETED_STATUS_ERROR_INVALID_MOUNT_OPTIONS;
case chromeos::MOUNT_ERROR_INVALID_UNMOUNT_OPTIONS:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_INVALID_UNMOUNT_OPTIONS;
case chromeos::MOUNT_ERROR_INSUFFICIENT_PERMISSIONS:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_INSUFFICIENT_PERMISSIONS;
case chromeos::MOUNT_ERROR_MOUNT_PROGRAM_NOT_FOUND:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_MOUNT_PROGRAM_NOT_FOUND;
case chromeos::MOUNT_ERROR_MOUNT_PROGRAM_FAILED:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_MOUNT_PROGRAM_FAILED;
case chromeos::MOUNT_ERROR_INVALID_DEVICE_PATH:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_INVALID_DEVICE_PATH;
case chromeos::MOUNT_ERROR_UNKNOWN_FILESYSTEM:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_UNKNOWN_FILESYSTEM;
case chromeos::MOUNT_ERROR_UNSUPPORTED_FILESYSTEM:
- return file_browser_private::
+ return file_manager_private::
MOUNT_COMPLETED_STATUS_ERROR_UNSUPPORTED_FILESYSTEM;
case chromeos::MOUNT_ERROR_INVALID_ARCHIVE:
- return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_INVALID_ARCHIVE;
+ return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_INVALID_ARCHIVE;
case chromeos::MOUNT_ERROR_NOT_AUTHENTICATED:
- return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_AUTHENTICATION;
+ return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_AUTHENTICATION;
case chromeos::MOUNT_ERROR_PATH_UNMOUNTED:
- return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_PATH_UNMOUNTED;
+ return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_PATH_UNMOUNTED;
}
NOTREACHED();
- return file_browser_private::MOUNT_COMPLETED_STATUS_NONE;
+ return file_manager_private::MOUNT_COMPLETED_STATUS_NONE;
}
-file_browser_private::CopyProgressStatusType
+file_manager_private::CopyProgressStatusType
CopyProgressTypeToCopyProgressStatusType(
storage::FileSystemOperation::CopyProgressType type) {
switch (type) {
case storage::FileSystemOperation::BEGIN_COPY_ENTRY:
- return file_browser_private::COPY_PROGRESS_STATUS_TYPE_BEGIN_COPY_ENTRY;
+ return file_manager_private::COPY_PROGRESS_STATUS_TYPE_BEGIN_COPY_ENTRY;
case storage::FileSystemOperation::END_COPY_ENTRY:
- return file_browser_private::COPY_PROGRESS_STATUS_TYPE_END_COPY_ENTRY;
+ return file_manager_private::COPY_PROGRESS_STATUS_TYPE_END_COPY_ENTRY;
case storage::FileSystemOperation::PROGRESS:
- return file_browser_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
+ return file_manager_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
}
NOTREACHED();
- return file_browser_private::COPY_PROGRESS_STATUS_TYPE_NONE;
+ return file_manager_private::COPY_PROGRESS_STATUS_TYPE_NONE;
}
-file_browser_private::ChangeType ConvertChangeTypeFromDriveToApi(
+file_manager_private::ChangeType ConvertChangeTypeFromDriveToApi(
drive::FileChange::ChangeType type) {
switch (type) {
case drive::FileChange::ADD_OR_UPDATE:
- return file_browser_private::CHANGE_TYPE_ADD_OR_UPDATE;
+ return file_manager_private::CHANGE_TYPE_ADD_OR_UPDATE;
case drive::FileChange::DELETE:
- return file_browser_private::CHANGE_TYPE_DELETE;
+ return file_manager_private::CHANGE_TYPE_DELETE;
}
NOTREACHED();
- return file_browser_private::CHANGE_TYPE_ADD_OR_UPDATE;
+ return file_manager_private::CHANGE_TYPE_ADD_OR_UPDATE;
}
std::string FileErrorToErrorName(base::File::Error error_code) {
- namespace js = extensions::api::file_browser_private;
+ namespace js = extensions::api::file_manager_private;
switch (error_code) {
case base::File::FILE_ERROR_NOT_FOUND:
return "NotFoundError";
@@ -329,17 +329,17 @@ class DeviceEventRouterImpl : public DeviceEventRouter {
explicit DeviceEventRouterImpl(Profile* profile) : profile_(profile) {}
// DeviceEventRouter overrides.
- virtual void OnDeviceEvent(file_browser_private::DeviceEventType type,
+ virtual void OnDeviceEvent(file_manager_private::DeviceEventType type,
const std::string& device_path) OVERRIDE {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- file_browser_private::DeviceEvent event;
+ file_manager_private::DeviceEvent event;
event.type = type;
event.device_path = device_path;
BroadcastEvent(profile_,
- file_browser_private::OnDeviceChanged::kEventName,
- file_browser_private::OnDeviceChanged::Create(event));
+ file_manager_private::OnDeviceChanged::kEventName,
+ file_manager_private::OnDeviceChanged::Create(event));
}
// DeviceEventRouter overrides.
@@ -537,22 +537,22 @@ void EventRouter::OnCopyCompleted(int copy_id,
base::File::Error error) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- file_browser_private::CopyProgressStatus status;
+ file_manager_private::CopyProgressStatus status;
if (error == base::File::FILE_OK) {
// Send success event.
- status.type = file_browser_private::COPY_PROGRESS_STATUS_TYPE_SUCCESS;
+ status.type = file_manager_private::COPY_PROGRESS_STATUS_TYPE_SUCCESS;
status.source_url.reset(new std::string(source_url.spec()));
status.destination_url.reset(new std::string(destination_url.spec()));
} else {
// Send error event.
- status.type = file_browser_private::COPY_PROGRESS_STATUS_TYPE_ERROR;
+ status.type = file_manager_private::COPY_PROGRESS_STATUS_TYPE_ERROR;
status.error.reset(new std::string(FileErrorToErrorName(error)));
}
BroadcastEvent(
profile_,
- file_browser_private::OnCopyProgress::kEventName,
- file_browser_private::OnCopyProgress::Create(copy_id, status));
+ file_manager_private::OnCopyProgress::kEventName,
+ file_manager_private::OnCopyProgress::Create(copy_id, status));
}
void EventRouter::OnCopyProgress(
@@ -563,7 +563,7 @@ void EventRouter::OnCopyProgress(
int64 size) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- file_browser_private::CopyProgressStatus status;
+ file_manager_private::CopyProgressStatus status;
status.type = CopyProgressTypeToCopyProgressStatusType(type);
status.source_url.reset(new std::string(source_url.spec()));
if (type == storage::FileSystemOperation::END_COPY_ENTRY)
@@ -573,14 +573,14 @@ void EventRouter::OnCopyProgress(
// Should not skip events other than TYPE_PROGRESS.
const bool always =
- status.type != file_browser_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
+ status.type != file_manager_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
if (!ShouldSendProgressEvent(always, &last_copy_progress_event_))
return;
BroadcastEvent(
profile_,
- file_browser_private::OnCopyProgress::kEventName,
- file_browser_private::OnCopyProgress::Create(copy_id, status));
+ file_manager_private::OnCopyProgress::kEventName,
+ file_manager_private::OnCopyProgress::Create(copy_id, status));
}
void EventRouter::DefaultNetworkChanged(const chromeos::NetworkState* network) {
@@ -591,8 +591,8 @@ void EventRouter::DefaultNetworkChanged(const chromeos::NetworkState* network) {
BroadcastEvent(
profile_,
- file_browser_private::OnDriveConnectionStatusChanged::kEventName,
- file_browser_private::OnDriveConnectionStatusChanged::Create());
+ file_manager_private::OnDriveConnectionStatusChanged::kEventName,
+ file_manager_private::OnDriveConnectionStatusChanged::Create());
}
void EventRouter::OnFileManagerPrefsChanged() {
@@ -603,8 +603,8 @@ void EventRouter::OnFileManagerPrefsChanged() {
BroadcastEvent(
profile_,
- file_browser_private::OnPreferencesChanged::kEventName,
- file_browser_private::OnPreferencesChanged::Create());
+ file_manager_private::OnPreferencesChanged::kEventName,
+ file_manager_private::OnPreferencesChanged::Create());
}
void EventRouter::OnJobAdded(const drive::JobInfo& job_info) {
@@ -671,7 +671,7 @@ void EventRouter::SendDriveFileTransferEvent() {
if (!drive_job_info_for_scheduled_event_)
return;
- file_browser_private::FileTransferStatus status;
+ file_manager_private::FileTransferStatus status;
JobInfoToTransferStatus(profile_,
kFileManagerAppId,
drive_job_info_for_scheduled_event_->status,
@@ -681,8 +681,8 @@ void EventRouter::SendDriveFileTransferEvent() {
drive_job_info_for_scheduled_event_.reset();
BroadcastEvent(profile_,
- file_browser_private::OnFileTransfersUpdated::kEventName,
- file_browser_private::OnFileTransfersUpdated::Create(status));
+ file_manager_private::OnFileTransfersUpdated::kEventName,
+ file_manager_private::OnFileTransfersUpdated::Create(status));
}
void EventRouter::OnDirectoryChanged(const base::FilePath& drive_path) {
@@ -708,27 +708,27 @@ void EventRouter::OnFileChanged(const drive::FileChange& changed_files) {
void EventRouter::OnDriveSyncError(drive::file_system::DriveSyncErrorType type,
const base::FilePath& drive_path) {
- file_browser_private::DriveSyncErrorEvent event;
+ file_manager_private::DriveSyncErrorEvent event;
switch (type) {
case drive::file_system::DRIVE_SYNC_ERROR_DELETE_WITHOUT_PERMISSION:
event.type =
- file_browser_private::DRIVE_SYNC_ERROR_TYPE_DELETE_WITHOUT_PERMISSION;
+ file_manager_private::DRIVE_SYNC_ERROR_TYPE_DELETE_WITHOUT_PERMISSION;
break;
case drive::file_system::DRIVE_SYNC_ERROR_SERVICE_UNAVAILABLE:
event.type =
- file_browser_private::DRIVE_SYNC_ERROR_TYPE_SERVICE_UNAVAILABLE;
+ file_manager_private::DRIVE_SYNC_ERROR_TYPE_SERVICE_UNAVAILABLE;
break;
case drive::file_system::DRIVE_SYNC_ERROR_MISC:
event.type =
- file_browser_private::DRIVE_SYNC_ERROR_TYPE_MISC;
+ file_manager_private::DRIVE_SYNC_ERROR_TYPE_MISC;
break;
}
event.file_url = util::ConvertDrivePathToFileSystemUrl(
profile_, drive_path, kFileManagerAppId).spec();
BroadcastEvent(
profile_,
- file_browser_private::OnDriveSyncError::kEventName,
- file_browser_private::OnDriveSyncError::Create(event));
+ file_manager_private::OnDriveSyncError::kEventName,
+ file_manager_private::OnDriveSyncError::Create(event));
}
void EventRouter::OnRefreshTokenInvalid() {
@@ -737,8 +737,8 @@ void EventRouter::OnRefreshTokenInvalid() {
// Raise a DriveConnectionStatusChanged event to notify the status offline.
BroadcastEvent(
profile_,
- file_browser_private::OnDriveConnectionStatusChanged::kEventName,
- file_browser_private::OnDriveConnectionStatusChanged::Create());
+ file_manager_private::OnDriveConnectionStatusChanged::kEventName,
+ file_manager_private::OnDriveConnectionStatusChanged::Create());
}
void EventRouter::HandleFileWatchNotification(const drive::FileChange* list,
@@ -812,15 +812,15 @@ void EventRouter::DispatchDirectoryChangeEventWithEntryDefinition(
return;
}
- file_browser_private::FileWatchEvent event;
+ file_manager_private::FileWatchEvent event;
event.event_type = watcher_error
- ? file_browser_private::FILE_WATCH_EVENT_TYPE_ERROR
- : file_browser_private::FILE_WATCH_EVENT_TYPE_CHANGED;
+ ? file_manager_private::FILE_WATCH_EVENT_TYPE_ERROR
+ : file_manager_private::FILE_WATCH_EVENT_TYPE_CHANGED;
// Detailed information is available.
if (list.get()) {
event.changed_files.reset(
- new std::vector<linked_ptr<file_browser_private::FileChange> >);
+ new std::vector<linked_ptr<file_manager_private::FileChange> >);
if (list->map().empty())
return;
@@ -828,8 +828,8 @@ void EventRouter::DispatchDirectoryChangeEventWithEntryDefinition(
for (drive::FileChange::Map::const_iterator it = list->map().begin();
it != list->map().end();
it++) {
- linked_ptr<file_browser_private::FileChange> change_list(
- new file_browser_private::FileChange);
+ linked_ptr<file_manager_private::FileChange> change_list(
+ new file_manager_private::FileChange);
GURL url = util::ConvertDrivePathToFileSystemUrl(
profile_, it->first, *extension_id);
@@ -857,8 +857,8 @@ void EventRouter::DispatchDirectoryChangeEventWithEntryDefinition(
entry_definition.is_directory);
BroadcastEvent(profile_,
- file_browser_private::OnDirectoryChanged::kEventName,
- file_browser_private::OnDirectoryChanged::Create(event));
+ file_manager_private::OnDirectoryChanged::kEventName,
+ file_manager_private::OnDirectoryChanged::Create(event));
}
void EventRouter::OnDiskAdded(
@@ -893,7 +893,7 @@ void EventRouter::OnVolumeMounted(chromeos::MountError error_code,
return;
DispatchMountCompletedEvent(
- file_browser_private::MOUNT_COMPLETED_EVENT_TYPE_MOUNT,
+ file_manager_private::MOUNT_COMPLETED_EVENT_TYPE_MOUNT,
error_code,
volume_info);
}
@@ -902,17 +902,17 @@ void EventRouter::OnVolumeUnmounted(chromeos::MountError error_code,
const VolumeInfo& volume_info) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DispatchMountCompletedEvent(
- file_browser_private::MOUNT_COMPLETED_EVENT_TYPE_UNMOUNT,
+ file_manager_private::MOUNT_COMPLETED_EVENT_TYPE_UNMOUNT,
error_code,
volume_info);
}
void EventRouter::DispatchMountCompletedEvent(
- file_browser_private::MountCompletedEventType event_type,
+ file_manager_private::MountCompletedEventType event_type,
chromeos::MountError error,
const VolumeInfo& volume_info) {
// Build an event object.
- file_browser_private::MountCompletedEvent event;
+ file_manager_private::MountCompletedEvent event;
event.event_type = event_type;
event.status = MountErrorToMountCompletedStatus(error);
util::VolumeInfoToVolumeMetadata(
@@ -920,8 +920,8 @@ void EventRouter::DispatchMountCompletedEvent(
event.should_notify = ShouldShowNotificationForVolume(
profile_, *device_event_router_, volume_info);
BroadcastEvent(profile_,
- file_browser_private::OnMountCompleted::kEventName,
- file_browser_private::OnMountCompleted::Create(event));
+ file_manager_private::OnMountCompleted::kEventName,
+ file_manager_private::OnMountCompleted::Create(event));
}
void EventRouter::OnFormatStarted(const std::string& device_path,
« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/event_router.h ('k') | chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698