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

Unified Diff: chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

Issue 12304015: Migrated sync_file_status, sync_action and sync_direction from fileapi:: namespace to sync_file_sys… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 10 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/extensions/api/sync_file_system/sync_file_system_api.cc
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
index 48c6e5059f8e3debf74d6c9c2030e2916e612790..20976abcbb52073d0a19db4770a0091d2be72be0 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
@@ -43,17 +43,16 @@ const char kFileError[] = "File error %d.";
const char kQuotaError[] = "Quota error %d.";
api::sync_file_system::FileStatus FileSyncStatusEnumToExtensionEnum(
- const fileapi::SyncFileStatus state) {
+ const sync_file_system::SyncFileStatus state) {
switch (state) {
- case fileapi::SYNC_FILE_STATUS_UNKNOWN:
+ case sync_file_system::SYNC_FILE_STATUS_UNKNOWN:
return api::sync_file_system::FILE_STATUS_NONE;
- case fileapi::SYNC_FILE_STATUS_SYNCED:
+ case sync_file_system::SYNC_FILE_STATUS_SYNCED:
return api::sync_file_system::FILE_STATUS_SYNCED;
- case fileapi::SYNC_FILE_STATUS_HAS_PENDING_CHANGES:
+ case sync_file_system::SYNC_FILE_STATUS_HAS_PENDING_CHANGES:
return api::sync_file_system::FILE_STATUS_PENDING;
- case fileapi::SYNC_FILE_STATUS_CONFLICTING:
- return api::sync_file_system::
- FILE_STATUS_CONFLICTING;
+ case sync_file_system::SYNC_FILE_STATUS_CONFLICTING:
+ return api::sync_file_system::FILE_STATUS_CONFLICTING;
}
NOTREACHED();
return api::sync_file_system::FILE_STATUS_NONE;
@@ -244,7 +243,7 @@ bool SyncFileSystemGetFileStatusFunction::RunImpl() {
void SyncFileSystemGetFileStatusFunction::DidGetFileStatus(
const fileapi::SyncStatusCode sync_service_status,
- const fileapi::SyncFileStatus sync_file_status) {
+ const sync_file_system::SyncFileStatus sync_file_status) {
// Repost to switch from IO thread to UI thread for SendResponse().
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

Powered by Google App Engine
This is Rietveld 408576698