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..06d844616d852ca2df59d08c014021e5b3bfcd29 100644 |
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc |
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc |
@@ -43,8 +43,8 @@ |
#include "extensions/browser/extension_host.h" |
#include "extensions/browser/extension_prefs.h" |
#include "extensions/browser/extension_system.h" |
-#include "webkit/common/fileapi/file_system_types.h" |
-#include "webkit/common/fileapi/file_system_util.h" |
+#include "storage/common/fileapi/file_system_types.h" |
+#include "storage/common/fileapi/file_system_util.h" |
using chromeos::disks::DiskMountManager; |
using chromeos::NetworkHandler; |
@@ -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. |