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

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

Issue 11316270: SyncFileSystem: Register origin only after the local-side initialization finishes successfully (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/sync_file_system_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_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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 void Initialize(scoped_ptr<LocalFileSyncService> local_file_service, 80 void Initialize(scoped_ptr<LocalFileSyncService> local_file_service,
81 scoped_ptr<RemoteFileSyncService> remote_file_service); 81 scoped_ptr<RemoteFileSyncService> remote_file_service);
82 82
83 void DidGetConflictFileInfo(const fileapi::ConflictFileInfoCallback& callback, 83 void DidGetConflictFileInfo(const fileapi::ConflictFileInfoCallback& callback,
84 const fileapi::FileSystemURL& url, 84 const fileapi::FileSystemURL& url,
85 const fileapi::SyncFileMetadata* local_metadata, 85 const fileapi::SyncFileMetadata* local_metadata,
86 const fileapi::SyncFileMetadata* remote_metadata, 86 const fileapi::SyncFileMetadata* remote_metadata,
87 fileapi::SyncStatusCode status); 87 fileapi::SyncStatusCode status);
88 88
89 // Callbacks for InitializeForApp.
90 void DidInitializeFileSystem(const GURL& app_origin,
91 const fileapi::SyncStatusCallback& callback,
92 fileapi::SyncStatusCode status);
89 void DidRegisterOrigin(const GURL& app_origin, 93 void DidRegisterOrigin(const GURL& app_origin,
90 const fileapi::SyncStatusCallback& callback, 94 const fileapi::SyncStatusCallback& callback,
91 fileapi::SyncStatusCode status); 95 fileapi::SyncStatusCode status);
92 96
93 // Called when following observer methods are called: 97 // Called when following observer methods are called:
94 // - OnLocalChangeAvailable() 98 // - OnLocalChangeAvailable()
95 // - OnRemoteChangeAvailable() 99 // - OnRemoteChangeAvailable()
96 // - OnRemoteServiceStateUpdated() 100 // - OnRemoteServiceStateUpdated()
97 void MaybeStartSync(); 101 void MaybeStartSync();
98 102
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 // ProfileKeyedServiceFactory overrides. 170 // ProfileKeyedServiceFactory overrides.
167 virtual ProfileKeyedService* BuildServiceInstanceFor( 171 virtual ProfileKeyedService* BuildServiceInstanceFor(
168 Profile* profile) const OVERRIDE; 172 Profile* profile) const OVERRIDE;
169 173
170 mutable scoped_ptr<RemoteFileSyncService> mock_remote_file_service_; 174 mutable scoped_ptr<RemoteFileSyncService> mock_remote_file_service_;
171 }; 175 };
172 176
173 } // namespace sync_file_system 177 } // namespace sync_file_system
174 178
175 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_ 179 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/sync_file_system_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698