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

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

Issue 11421124: In local_change:remote_change conflict case we may have no data in metadata_store (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/drive_file_sync_service.cc » ('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 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 void DidRemoveOriginOnMetadataStore( 222 void DidRemoveOriginOnMetadataStore(
223 scoped_ptr<TaskToken> token, 223 scoped_ptr<TaskToken> token,
224 const fileapi::SyncStatusCallback& callback, 224 const fileapi::SyncStatusCallback& callback,
225 fileapi::SyncStatusCode status); 225 fileapi::SyncStatusCode status);
226 226
227 void AppendNewRemoteChange(const GURL& origin, 227 void AppendNewRemoteChange(const GURL& origin,
228 google_apis::DocumentEntry* entry, 228 google_apis::DocumentEntry* entry,
229 int64 changestamp); 229 int64 changestamp);
230 void CancelRemoteChange(const fileapi::FileSystemURL& url); 230 void CancelRemoteChange(const fileapi::FileSystemURL& url);
231 231
232 // This returns false if no change is found for the |url|.
233 bool GetPendingChangeForFileSystemURL(const fileapi::FileSystemURL& url,
234 RemoteChange* change) const;
235
232 scoped_ptr<DriveMetadataStore> metadata_store_; 236 scoped_ptr<DriveMetadataStore> metadata_store_;
233 scoped_ptr<DriveFileSyncClient> sync_client_; 237 scoped_ptr<DriveFileSyncClient> sync_client_;
234 238
235 fileapi::SyncStatusCode last_operation_status_; 239 fileapi::SyncStatusCode last_operation_status_;
236 RemoteServiceState state_; 240 RemoteServiceState state_;
237 std::deque<base::Closure> pending_tasks_; 241 std::deque<base::Closure> pending_tasks_;
238 242
239 int64 largest_changestamp_; 243 int64 largest_changestamp_;
240 PendingChangeQueue pending_changes_; 244 PendingChangeQueue pending_changes_;
241 URLToChange url_to_change_; 245 URLToChange url_to_change_;
(...skipping 10 matching lines...) Expand all
252 // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer 256 // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer
253 // in |token_|. 257 // in |token_|.
254 base::WeakPtrFactory<DriveFileSyncService> weak_factory_; 258 base::WeakPtrFactory<DriveFileSyncService> weak_factory_;
255 259
256 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService); 260 DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService);
257 }; 261 };
258 262
259 } // namespace sync_file_system 263 } // namespace sync_file_system
260 264
261 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_ 265 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_file_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698