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

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

Issue 16190005: [SyncFileSystem] Stop referring to DriveFileSyncService from extension/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 (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_SYNC_FILE_SYSTEM_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 void GetFileSyncStatus( 60 void GetFileSyncStatus(
61 const fileapi::FileSystemURL& url, 61 const fileapi::FileSystemURL& url,
62 const SyncFileStatusCallback& callback); 62 const SyncFileStatusCallback& callback);
63 63
64 void AddSyncEventObserver(SyncEventObserver* observer); 64 void AddSyncEventObserver(SyncEventObserver* observer);
65 void RemoveSyncEventObserver(SyncEventObserver* observer); 65 void RemoveSyncEventObserver(SyncEventObserver* observer);
66 66
67 ConflictResolutionPolicy GetConflictResolutionPolicy() const; 67 ConflictResolutionPolicy GetConflictResolutionPolicy() const;
68 SyncStatusCode SetConflictResolutionPolicy(ConflictResolutionPolicy policy); 68 SyncStatusCode SetConflictResolutionPolicy(ConflictResolutionPolicy policy);
69 69
70 static std::string GetDefaultServiceName();
71
70 private: 72 private:
71 friend class SyncFileSystemServiceFactory; 73 friend class SyncFileSystemServiceFactory;
72 friend class SyncFileSystemServiceTest; 74 friend class SyncFileSystemServiceTest;
73 friend struct base::DefaultDeleter<SyncFileSystemService>; 75 friend struct base::DefaultDeleter<SyncFileSystemService>;
74 76
75 explicit SyncFileSystemService(Profile* profile); 77 explicit SyncFileSystemService(Profile* profile);
76 virtual ~SyncFileSystemService(); 78 virtual ~SyncFileSystemService();
77 79
78 void Initialize(scoped_ptr<LocalFileSyncService> local_file_service, 80 void Initialize(scoped_ptr<LocalFileSyncService> local_file_service,
79 scoped_ptr<RemoteFileSyncService> remote_file_service); 81 scoped_ptr<RemoteFileSyncService> remote_file_service);
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 base::OneShotTimer<SyncFileSystemService> sync_retry_timer_; 172 base::OneShotTimer<SyncFileSystemService> sync_retry_timer_;
171 173
172 ObserverList<SyncEventObserver> observers_; 174 ObserverList<SyncEventObserver> observers_;
173 175
174 DISALLOW_COPY_AND_ASSIGN(SyncFileSystemService); 176 DISALLOW_COPY_AND_ASSIGN(SyncFileSystemService);
175 }; 177 };
176 178
177 } // namespace sync_file_system 179 } // namespace sync_file_system
178 180
179 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_ 181 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698