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

Unified Diff: sync/syncable/directory.h

Issue 1275743002: [Sync] Remove backend unrecoverable error handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix leak Created 5 years, 4 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 | « sync/internal_api/sync_rollback_manager_base_unittest.cc ('k') | sync/syncable/directory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/directory.h
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
index 7358f179bd94e0a53fb97ecb69eb3ae30c4e8235..d71fcf8a0e3c50037ff9e1d019a6e0d3e435776b 100644
--- a/sync/syncable/directory.h
+++ b/sync/syncable/directory.h
@@ -248,11 +248,12 @@ class SYNC_EXPORT Directory {
// Does not take ownership of |encryptor|.
// |report_unrecoverable_error_function| may be NULL.
// Takes ownership of |store|.
- Directory(DirectoryBackingStore* store,
- UnrecoverableErrorHandler* unrecoverable_error_handler,
- const base::Closure& report_unrecoverable_error_function,
- NigoriHandler* nigori_handler,
- Cryptographer* cryptographer);
+ Directory(
+ DirectoryBackingStore* store,
+ const WeakHandle<UnrecoverableErrorHandler>& unrecoverable_error_handler,
+ const base::Closure& report_unrecoverable_error_function,
+ NigoriHandler* nigori_handler,
+ Cryptographer* cryptographer);
virtual ~Directory();
// Does not take ownership of |delegate|, which must not be NULL.
@@ -636,7 +637,7 @@ class SYNC_EXPORT Directory {
scoped_ptr<DirectoryBackingStore> store_;
- UnrecoverableErrorHandler* const unrecoverable_error_handler_;
+ const WeakHandle<UnrecoverableErrorHandler> unrecoverable_error_handler_;
base::Closure report_unrecoverable_error_function_;
bool unrecoverable_error_set_;
« no previous file with comments | « sync/internal_api/sync_rollback_manager_base_unittest.cc ('k') | sync/syncable/directory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698