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

Side by Side Diff: components/sync_driver/model_association_manager.h

Issue 554233002: Refactoring the WeakPtrFactory usage, Member variables should appear before the WeakPtrFactory, to … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 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 COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ 5 #ifndef COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__
6 #define COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ 6 #define COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 // Set of all registered controllers. 140 // Set of all registered controllers.
141 const DataTypeController::TypeMap* controllers_; 141 const DataTypeController::TypeMap* controllers_;
142 142
143 // The processor in charge of handling model association results. 143 // The processor in charge of handling model association results.
144 ModelAssociationManagerDelegate* delegate_; 144 ModelAssociationManagerDelegate* delegate_;
145 145
146 // Timer to track and limit how long a datatype takes to model associate. 146 // Timer to track and limit how long a datatype takes to model associate.
147 base::OneShotTimer<ModelAssociationManager> timer_; 147 base::OneShotTimer<ModelAssociationManager> timer_;
148 148
149 DataTypeManager::ConfigureStatus configure_status_;
150
149 base::WeakPtrFactory<ModelAssociationManager> weak_ptr_factory_; 151 base::WeakPtrFactory<ModelAssociationManager> weak_ptr_factory_;
150 152
151 DataTypeManager::ConfigureStatus configure_status_;
152
153 DISALLOW_COPY_AND_ASSIGN(ModelAssociationManager); 153 DISALLOW_COPY_AND_ASSIGN(ModelAssociationManager);
154 }; 154 };
155 155
156 } // namespace sync_driver 156 } // namespace sync_driver
157 157
158 #endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__ 158 #endif // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698