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

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

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos build Created 6 years, 4 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: 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 a668c70aad9a05015de939e60061ef6e926c64c7..32e99b0f4b4fc20408c965de70077adf7b11d15b 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -195,13 +195,13 @@ MountErrorToMountCompletedStatus(chromeos::MountError error) {
file_browser_private::CopyProgressStatusType
CopyProgressTypeToCopyProgressStatusType(
- fileapi::FileSystemOperation::CopyProgressType type) {
+ storage::FileSystemOperation::CopyProgressType type) {
switch (type) {
- case fileapi::FileSystemOperation::BEGIN_COPY_ENTRY:
+ case storage::FileSystemOperation::BEGIN_COPY_ENTRY:
return file_browser_private::COPY_PROGRESS_STATUS_TYPE_BEGIN_COPY_ENTRY;
- case fileapi::FileSystemOperation::END_COPY_ENTRY:
+ case storage::FileSystemOperation::END_COPY_ENTRY:
return file_browser_private::COPY_PROGRESS_STATUS_TYPE_END_COPY_ENTRY;
- case fileapi::FileSystemOperation::PROGRESS:
+ case storage::FileSystemOperation::PROGRESS:
return file_browser_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
}
NOTREACHED();
@@ -527,7 +527,7 @@ void EventRouter::OnCopyCompleted(int copy_id,
void EventRouter::OnCopyProgress(
int copy_id,
- fileapi::FileSystemOperation::CopyProgressType type,
+ storage::FileSystemOperation::CopyProgressType type,
const GURL& source_url,
const GURL& destination_url,
int64 size) {
@@ -536,9 +536,9 @@ void EventRouter::OnCopyProgress(
file_browser_private::CopyProgressStatus status;
status.type = CopyProgressTypeToCopyProgressStatusType(type);
status.source_url.reset(new std::string(source_url.spec()));
- if (type == fileapi::FileSystemOperation::END_COPY_ENTRY)
+ if (type == storage::FileSystemOperation::END_COPY_ENTRY)
status.destination_url.reset(new std::string(destination_url.spec()));
- if (type == fileapi::FileSystemOperation::PROGRESS)
+ if (type == storage::FileSystemOperation::PROGRESS)
status.size.reset(new double(size));
// Should not skip events other than TYPE_PROGRESS.

Powered by Google App Engine
This is Rietveld 408576698