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

Side by Side Diff: chrome/browser/sync_file_system/drive_file_sync_service.cc

Issue 13929012: SyncFS: Add resource type field into DriveMetadata (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/sync_file_system.proto » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 google_apis::GDataErrorCode error, 1238 google_apis::GDataErrorCode error,
1239 const std::string& resource_id, 1239 const std::string& resource_id,
1240 const std::string& file_md5) { 1240 const std::string& file_md5) {
1241 DCHECK(param); 1241 DCHECK(param);
1242 const FileSystemURL& url = param->url; 1242 const FileSystemURL& url = param->url;
1243 if (error == google_apis::HTTP_CREATED) { 1243 if (error == google_apis::HTTP_CREATED) {
1244 param->drive_metadata.set_resource_id(resource_id); 1244 param->drive_metadata.set_resource_id(resource_id);
1245 param->drive_metadata.set_md5_checksum(file_md5); 1245 param->drive_metadata.set_md5_checksum(file_md5);
1246 param->drive_metadata.set_conflicted(false); 1246 param->drive_metadata.set_conflicted(false);
1247 param->drive_metadata.set_to_be_fetched(false); 1247 param->drive_metadata.set_to_be_fetched(false);
1248 param->drive_metadata.set_type(DriveMetadata::RESOURCE_TYPE_FILE);
1248 const DriveMetadata& metadata = param->drive_metadata; 1249 const DriveMetadata& metadata = param->drive_metadata;
1249 metadata_store_->UpdateEntry( 1250 metadata_store_->UpdateEntry(
1250 url, metadata, 1251 url, metadata,
1251 base::Bind(&DriveFileSyncService::DidApplyLocalChange, 1252 base::Bind(&DriveFileSyncService::DidApplyLocalChange,
1252 AsWeakPtr(), base::Passed(&param), error)); 1253 AsWeakPtr(), base::Passed(&param), error));
1253 NotifyObserversFileStatusChanged(url, 1254 NotifyObserversFileStatusChanged(url,
1254 SYNC_FILE_STATUS_SYNCED, 1255 SYNC_FILE_STATUS_SYNCED,
1255 SYNC_ACTION_ADDED, 1256 SYNC_ACTION_ADDED,
1256 SYNC_DIRECTION_LOCAL_TO_REMOTE); 1257 SYNC_DIRECTION_LOCAL_TO_REMOTE);
1257 return; 1258 return;
1258 } 1259 }
1259 FinalizeLocalSync(param->token.Pass(), param->callback, 1260 FinalizeLocalSync(param->token.Pass(), param->callback,
1260 GDataErrorCodeToSyncStatusCodeWrapper(error)); 1261 GDataErrorCodeToSyncStatusCodeWrapper(error));
1261 } 1262 }
1262 1263
1263 void DriveFileSyncService::DidUploadExistingFileForLocalSync( 1264 void DriveFileSyncService::DidUploadExistingFileForLocalSync(
1264 scoped_ptr<ApplyLocalChangeParam> param, 1265 scoped_ptr<ApplyLocalChangeParam> param,
1265 google_apis::GDataErrorCode error, 1266 google_apis::GDataErrorCode error,
1266 const std::string& resource_id, 1267 const std::string& resource_id,
1267 const std::string& file_md5) { 1268 const std::string& file_md5) {
1268 DCHECK(param); 1269 DCHECK(param);
1269 DCHECK(param->has_drive_metadata); 1270 DCHECK(param->has_drive_metadata);
1270 const FileSystemURL& url = param->url; 1271 const FileSystemURL& url = param->url;
1271 switch (error) { 1272 switch (error) {
1272 case google_apis::HTTP_SUCCESS: { 1273 case google_apis::HTTP_SUCCESS: {
1273 param->drive_metadata.set_resource_id(resource_id); 1274 param->drive_metadata.set_resource_id(resource_id);
1274 param->drive_metadata.set_md5_checksum(file_md5); 1275 param->drive_metadata.set_md5_checksum(file_md5);
1275 param->drive_metadata.set_conflicted(false); 1276 param->drive_metadata.set_conflicted(false);
1276 param->drive_metadata.set_to_be_fetched(false); 1277 param->drive_metadata.set_to_be_fetched(false);
1278 param->drive_metadata.set_type(DriveMetadata::RESOURCE_TYPE_FILE);
1277 const DriveMetadata& metadata = param->drive_metadata; 1279 const DriveMetadata& metadata = param->drive_metadata;
1278 metadata_store_->UpdateEntry( 1280 metadata_store_->UpdateEntry(
1279 url, metadata, 1281 url, metadata,
1280 base::Bind(&DriveFileSyncService::DidApplyLocalChange, 1282 base::Bind(&DriveFileSyncService::DidApplyLocalChange,
1281 AsWeakPtr(), base::Passed(&param), error)); 1283 AsWeakPtr(), base::Passed(&param), error));
1282 NotifyObserversFileStatusChanged(url, 1284 NotifyObserversFileStatusChanged(url,
1283 SYNC_FILE_STATUS_SYNCED, 1285 SYNC_FILE_STATUS_SYNCED,
1284 SYNC_ACTION_UPDATED, 1286 SYNC_ACTION_UPDATED,
1285 SYNC_DIRECTION_LOCAL_TO_REMOTE); 1287 SYNC_DIRECTION_LOCAL_TO_REMOTE);
1286 return; 1288 return;
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
2357 pending_batch_sync_origins_.insert(origin); 2359 pending_batch_sync_origins_.insert(origin);
2358 } 2360 }
2359 callback.Run(status, resource_id); 2361 callback.Run(status, resource_id);
2360 } 2362 }
2361 2363
2362 std::string DriveFileSyncService::sync_root_resource_id() { 2364 std::string DriveFileSyncService::sync_root_resource_id() {
2363 return metadata_store_->sync_root_directory(); 2365 return metadata_store_->sync_root_directory();
2364 } 2366 }
2365 2367
2366 } // namespace sync_file_system 2368 } // namespace sync_file_system
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/sync_file_system.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698