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

Side by Side Diff: sync/internal_api/sync_manager_impl.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 SYNC_INTERNAL_API_SYNC_MANAGER_H_ 5 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_
6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_ 6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 WeakHandle<SyncManagerImpl> weak_handle_this_; 266 WeakHandle<SyncManagerImpl> weak_handle_this_;
267 267
268 // We give a handle to share_ to clients of the API for use when constructing 268 // We give a handle to share_ to clients of the API for use when constructing
269 // any transaction type. 269 // any transaction type.
270 UserShare share_; 270 UserShare share_;
271 271
272 // This can be called from any thread, but only between calls to 272 // This can be called from any thread, but only between calls to
273 // OpenDirectory() and ShutdownOnSyncThread(). 273 // OpenDirectory() and ShutdownOnSyncThread().
274 WeakHandle<SyncManager::ChangeObserver> change_observer_; 274 WeakHandle<SyncManager::ChangeObserver> change_observer_;
275 275
276 ObserverList<SyncManager::Observer> observers_; 276 base::ObserverList<SyncManager::Observer> observers_;
277 277
278 // The ServerConnectionManager used to abstract communication between the 278 // The ServerConnectionManager used to abstract communication between the
279 // client (the Syncer) and the sync server. 279 // client (the Syncer) and the sync server.
280 scoped_ptr<SyncAPIServerConnectionManager> connection_manager_; 280 scoped_ptr<SyncAPIServerConnectionManager> connection_manager_;
281 281
282 // Maintains state that affects the way we interact with different sync types. 282 // Maintains state that affects the way we interact with different sync types.
283 // This state changes when entering or exiting a configuration cycle. 283 // This state changes when entering or exiting a configuration cycle.
284 scoped_ptr<ModelTypeRegistry> model_type_registry_; 284 scoped_ptr<ModelTypeRegistry> model_type_registry_;
285 285
286 // The main interface for non-blocking sync types and a thread-safe wrapper. 286 // The main interface for non-blocking sync types and a thread-safe wrapper.
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 scoped_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_; 338 scoped_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_;
339 339
340 base::WeakPtrFactory<SyncManagerImpl> weak_ptr_factory_; 340 base::WeakPtrFactory<SyncManagerImpl> weak_ptr_factory_;
341 341
342 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl); 342 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl);
343 }; 343 };
344 344
345 } // namespace syncer 345 } // namespace syncer
346 346
347 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ 347 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_
OLDNEW
« no previous file with comments | « sync/internal_api/sync_encryption_handler_impl.h ('k') | sync/internal_api/sync_rollback_manager_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698