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

Unified Diff: sync/engine/sync_scheduler_impl.h

Issue 26594002: Chrome sync: Put WeakPtrFactory members at the end (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge (see prior patch for try jobs) Created 7 years, 2 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
Index: sync/engine/sync_scheduler_impl.h
diff --git a/sync/engine/sync_scheduler_impl.h b/sync/engine/sync_scheduler_impl.h
index 8492463b5307ff594c63b001819cb26023ea156d..8cb5af76fde6f67362ec4e6c3f46bdaba4465dd9 100644
--- a/sync/engine/sync_scheduler_impl.h
+++ b/sync/engine/sync_scheduler_impl.h
@@ -239,14 +239,8 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl
virtual void OnActionableError(const sessions::SyncSessionSnapshot& snapshot);
- base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_;
-
- // A second factory specially for weak_handle_this_, to allow the handle
- // to be const and alleviate threading concerns.
- base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_for_weak_handle_;
-
// For certain methods that need to worry about X-thread posting.
- const WeakHandle<SyncSchedulerImpl> weak_handle_this_;
+ WeakHandle<SyncSchedulerImpl> weak_handle_this_;
// Used for logging.
const std::string name_;
@@ -316,6 +310,12 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl
// after credentials are updated.
bool do_poll_after_credentials_updated_;
+ base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_;
+
+ // A second factory specially for weak_handle_this_, to allow the handle
+ // to be const and alleviate threading concerns.
+ base::WeakPtrFactory<SyncSchedulerImpl> weak_ptr_factory_for_weak_handle_;
+
DISALLOW_COPY_AND_ASSIGN(SyncSchedulerImpl);
};

Powered by Google App Engine
This is Rietveld 408576698