chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc - Issue 125733003: [SyncFS] Clean up V1 drive_file_sync_util.h dependency from V2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc

Issue 125733003: [SyncFS] Clean up V1 drive_file_sync_util.h dependency from V2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 11 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/sync_file_system/drive_backend/uninstall_app_task.cc ('k') | chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc

diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc

index e734eb131b5c5fc2520c9bcdcedb7712e09501d9..b54d96f0266d3145ee8825a8113aa07b2ef8b3b8 100644

--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc

+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc

@@ -21,6 +21,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"

#include "chrome/browser/sync_file_system/drive_backend_v1/api_util.h"

#include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h"

#include "chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.h"

@@ -445,7 +446,8 @@ void DriveFileSyncService::UpdateServiceStateFromLastOperationStatus(

case SYNC_STATUS_OK:

// If the last Drive-related operation was successful we can

// change the service state to OK.

- if (GDataErrorCodeToSyncStatusCode(gdata_error) == SYNC_STATUS_OK)

+ if (drive_backend::GDataErrorCodeToSyncStatusCode(gdata_error) ==

+ SYNC_STATUS_OK)

UpdateServiceState(REMOTE_SERVICE_OK, std::string());

break;

@@ -1147,7 +1149,7 @@ void DriveFileSyncService::NotifyConflict(

SyncStatusCode DriveFileSyncService::GDataErrorCodeToSyncStatusCodeWrapper(

google_apis::GDataErrorCode error) {

last_gdata_error_ = error;

- SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);

+ SyncStatusCode status = drive_backend::GDataErrorCodeToSyncStatusCode(error);

if (status != SYNC_STATUS_OK && !api_util_->IsAuthenticated())

return SYNC_STATUS_AUTHENTICATION_FAILED;

return status;