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

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

Issue 246163005: [SyncFS] Make ExtensionService usage of SyncWorker asynchronous (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: buildfix Created 6 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
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 virtual void UpdateServiceState(RemoteServiceState state, 60 virtual void UpdateServiceState(RemoteServiceState state,
61 const std::string& description) = 0; 61 const std::string& description) = 0;
62 62
63 protected: 63 protected:
64 virtual ~Observer() {} 64 virtual ~Observer() {}
65 }; 65 };
66 66
67 static scoped_ptr<SyncWorker> CreateOnWorker( 67 static scoped_ptr<SyncWorker> CreateOnWorker(
68 const base::FilePath& base_dir, 68 const base::FilePath& base_dir,
69 Observer* observer, 69 Observer* observer,
70 ExtensionServiceInterface* extension_service, 70 const base::WeakPtr<ExtensionServiceInterface>& extension_service,
71 scoped_ptr<SyncEngineContext> sync_engine_context, 71 scoped_ptr<SyncEngineContext> sync_engine_context,
72 leveldb::Env* env_override); 72 leveldb::Env* env_override);
73 73
74 virtual ~SyncWorker(); 74 virtual ~SyncWorker();
75 75
76 void Initialize(); 76 void Initialize();
77 77
78 // SyncTaskManager::Client overrides 78 // SyncTaskManager::Client overrides
79 virtual void MaybeScheduleNextTask() OVERRIDE; 79 virtual void MaybeScheduleNextTask() OVERRIDE;
80 virtual void NotifyLastOperationStatus( 80 virtual void NotifyLastOperationStatus(
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 drive::DriveUploaderInterface* GetDriveUploader(); 122 drive::DriveUploaderInterface* GetDriveUploader();
123 MetadataDatabase* GetMetadataDatabase(); 123 MetadataDatabase* GetMetadataDatabase();
124 SyncTaskManager* GetSyncTaskManager(); 124 SyncTaskManager* GetSyncTaskManager();
125 125
126 void AddObserver(Observer* observer); 126 void AddObserver(Observer* observer);
127 127
128 private: 128 private:
129 friend class DriveBackendSyncTest; 129 friend class DriveBackendSyncTest;
130 friend class SyncEngineTest; 130 friend class SyncEngineTest;
131 131
132 enum AppStatus {
peria 2014/04/24 02:38:21 (optional) I recommend to move this enum to extens
tzik 2014/04/24 06:56:55 ExtensionRegistry has similar but fine grained, wh
133 APP_STATUS_ENABLED,
134 APP_STATUS_DISABLED,
135 APP_STATUS_UNINSTALLED,
136 };
137
138 typedef base::hash_map<std::string, AppStatus> AppStatusMap;
139
132 SyncWorker(const base::FilePath& base_dir, 140 SyncWorker(const base::FilePath& base_dir,
133 ExtensionServiceInterface* extension_service, 141 const base::WeakPtr<ExtensionServiceInterface>& extension_service,
134 scoped_ptr<SyncEngineContext> sync_engine_context, 142 scoped_ptr<SyncEngineContext> sync_engine_context,
135 leveldb::Env* env_override); 143 leveldb::Env* env_override);
136 144
137 void DoDisableApp(const std::string& app_id, 145 void DoDisableApp(const std::string& app_id,
138 const SyncStatusCallback& callback); 146 const SyncStatusCallback& callback);
139 void DoEnableApp(const std::string& app_id, 147 void DoEnableApp(const std::string& app_id,
140 const SyncStatusCallback& callback); 148 const SyncStatusCallback& callback);
141 149
142 void PostInitializeTask(); 150 void PostInitializeTask();
143 void DidInitialize(SyncEngineInitializer* initializer, 151 void DidInitialize(SyncEngineInitializer* initializer,
144 SyncStatusCode status); 152 SyncStatusCode status);
145 void UpdateRegisteredApp(); 153 void UpdateRegisteredApp();
154 static void QueryAppStatusOnUIThread(
155 const base::WeakPtr<ExtensionServiceInterface>& extension_service_ptr,
156 const std::vector<std::string>* apps,
157 AppStatusMap* status,
158 const base::Closure& callback);
159 void DidQueryAppStatus(const AppStatusMap* app_status);
146 void DidProcessRemoteChange(RemoteToLocalSyncer* syncer, 160 void DidProcessRemoteChange(RemoteToLocalSyncer* syncer,
147 const SyncFileCallback& callback, 161 const SyncFileCallback& callback,
148 SyncStatusCode status); 162 SyncStatusCode status);
149 void DidApplyLocalChange(LocalToRemoteSyncer* syncer, 163 void DidApplyLocalChange(LocalToRemoteSyncer* syncer,
150 const SyncStatusCallback& callback, 164 const SyncStatusCallback& callback,
151 SyncStatusCode status); 165 SyncStatusCode status);
152 166
153 void MaybeStartFetchChanges(); 167 void MaybeStartFetchChanges();
154 void DidResolveConflict(SyncStatusCode status); 168 void DidResolveConflict(SyncStatusCode status);
155 void DidFetchChanges(SyncStatusCode status); 169 void DidFetchChanges(SyncStatusCode status);
(...skipping 15 matching lines...) Expand all
171 bool should_check_remote_change_; 185 bool should_check_remote_change_;
172 bool listing_remote_changes_; 186 bool listing_remote_changes_;
173 base::TimeTicks time_to_check_changes_; 187 base::TimeTicks time_to_check_changes_;
174 188
175 bool sync_enabled_; 189 bool sync_enabled_;
176 ConflictResolutionPolicy default_conflict_resolution_policy_; 190 ConflictResolutionPolicy default_conflict_resolution_policy_;
177 bool network_available_; 191 bool network_available_;
178 192
179 scoped_ptr<SyncTaskManager> task_manager_; 193 scoped_ptr<SyncTaskManager> task_manager_;
180 194
181 // TODO(tzik): Add a proxy class for ExtensionServiceInterface to cross 195 base::WeakPtr<ExtensionServiceInterface> extension_service_;
182 // thread, and hold its instance as WeakPtr here.
183 ExtensionServiceInterface* extension_service_;
184 196
185 scoped_ptr<SyncEngineContext> context_; 197 scoped_ptr<SyncEngineContext> context_;
186 ObserverList<Observer> observers_; 198 ObserverList<Observer> observers_;
187 199
188 base::WeakPtrFactory<SyncWorker> weak_ptr_factory_; 200 base::WeakPtrFactory<SyncWorker> weak_ptr_factory_;
189 DISALLOW_COPY_AND_ASSIGN(SyncWorker); 201 DISALLOW_COPY_AND_ASSIGN(SyncWorker);
190 }; 202 };
191 203
192 } // namespace drive_backend 204 } // namespace drive_backend
193 } // namespace sync_file_system 205 } // namespace sync_file_system
194 206
195 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_ 207 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_WORKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698