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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_worker.h

Issue 306813002: [SyncFS] Make routines using metadata database async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove needless method Created 6 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_BACKEND_SYNC_WORKER_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 const SyncStatusCallback& callback); 98 const SyncStatusCallback& callback);
99 void ProcessRemoteChange(const SyncFileCallback& callback); 99 void ProcessRemoteChange(const SyncFileCallback& callback);
100 void SetRemoteChangeProcessor( 100 void SetRemoteChangeProcessor(
101 RemoteChangeProcessorOnWorker* remote_change_processor_on_worker); 101 RemoteChangeProcessorOnWorker* remote_change_processor_on_worker);
102 RemoteServiceState GetCurrentState() const; 102 RemoteServiceState GetCurrentState() const;
103 void GetOriginStatusMap( 103 void GetOriginStatusMap(
104 const RemoteFileSyncService::StatusMapCallback& callback); 104 const RemoteFileSyncService::StatusMapCallback& callback);
105 scoped_ptr<base::ListValue> DumpFiles(const GURL& origin); 105 scoped_ptr<base::ListValue> DumpFiles(const GURL& origin);
106 scoped_ptr<base::ListValue> DumpDatabase(); 106 scoped_ptr<base::ListValue> DumpDatabase();
107 void SetSyncEnabled(bool enabled); 107 void SetSyncEnabled(bool enabled);
108 void PromoteDemotedChanges();
108 SyncStatusCode SetDefaultConflictResolutionPolicy( 109 SyncStatusCode SetDefaultConflictResolutionPolicy(
109 ConflictResolutionPolicy policy); 110 ConflictResolutionPolicy policy);
110 SyncStatusCode SetConflictResolutionPolicy( 111 SyncStatusCode SetConflictResolutionPolicy(
111 const GURL& origin, 112 const GURL& origin,
112 ConflictResolutionPolicy policy); 113 ConflictResolutionPolicy policy);
113 ConflictResolutionPolicy GetDefaultConflictResolutionPolicy() 114 ConflictResolutionPolicy GetDefaultConflictResolutionPolicy()
114 const; 115 const;
115 ConflictResolutionPolicy GetConflictResolutionPolicy( 116 ConflictResolutionPolicy GetConflictResolutionPolicy(
116 const GURL& origin) const; 117 const GURL& origin) const;
117 118
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 ObserverList<Observer> observers_; 192 ObserverList<Observer> observers_;
192 193
193 base::WeakPtrFactory<SyncWorker> weak_ptr_factory_; 194 base::WeakPtrFactory<SyncWorker> weak_ptr_factory_;
194 DISALLOW_COPY_AND_ASSIGN(SyncWorker); 195 DISALLOW_COPY_AND_ASSIGN(SyncWorker);
195 }; 196 };
196 197
197 } // namespace drive_backend 198 } // namespace drive_backend
198 } // namespace sync_file_system 199 } // namespace sync_file_system
199 200
200 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_ 201 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698