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

Unified Diff: chrome/browser/extensions/app_notification_manager.h

Issue 9749012: [Sync] Have SyncableService's take ownership of their SyncChangeProcessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/app_notification_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/app_notification_manager.h
diff --git a/chrome/browser/extensions/app_notification_manager.h b/chrome/browser/extensions/app_notification_manager.h
index 166298b67e918b491f340e3a7a7f09c704feb3aa..fae3b9e7a78697f1afee9554a3da2ec74f0d0c3f 100644
--- a/chrome/browser/extensions/app_notification_manager.h
+++ b/chrome/browser/extensions/app_notification_manager.h
@@ -73,7 +73,7 @@ class AppNotificationManager
virtual SyncError MergeDataAndStartSyncing(
syncable::ModelType type,
const SyncDataList& initial_sync_data,
- SyncChangeProcessor* sync_processor) OVERRIDE;
+ scoped_ptr<SyncChangeProcessor> sync_processor) OVERRIDE;
virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
private:
@@ -155,7 +155,7 @@ class AppNotificationManager
scoped_ptr<AppNotificationStorage> storage_;
// Sync change processor we use to push all our changes.
- SyncChangeProcessor* sync_processor_;
+ scoped_ptr<SyncChangeProcessor> sync_processor_;
// Whether the sync model is associated with the local model.
// In other words, whether we are ready to apply sync changes.
bool models_associated_;
« no previous file with comments | « no previous file | chrome/browser/extensions/app_notification_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698