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

Side by Side Diff: components/enhanced_bookmarks/enhanced_bookmark_model.h

Issue 630983003: Declaring the weak_ptr_factory in proper order in src/components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 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_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_ 5 #ifndef COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_
6 #define COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_ 6 #define COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 BookmarkNode::MetaInfoMap meta_info); 180 BookmarkNode::MetaInfoMap meta_info);
181 181
182 // Returns the version string to use when setting stars.version. 182 // Returns the version string to use when setting stars.version.
183 std::string GetVersionString(); 183 std::string GetVersionString();
184 184
185 BookmarkModel* bookmark_model_; 185 BookmarkModel* bookmark_model_;
186 bool loaded_; 186 bool loaded_;
187 187
188 ObserverList<EnhancedBookmarkModelObserver> observers_; 188 ObserverList<EnhancedBookmarkModelObserver> observers_;
189 189
190 base::WeakPtrFactory<EnhancedBookmarkModel> weak_ptr_factory_;
191
192 IdToNodeMap id_map_; 190 IdToNodeMap id_map_;
193 NodeToIdMap nodes_to_reset_; 191 NodeToIdMap nodes_to_reset_;
194 192
195 // Caches the remote id of a node before its meta info changes. 193 // Caches the remote id of a node before its meta info changes.
196 std::string prev_remote_id_; 194 std::string prev_remote_id_;
197 195
198 std::string version_; 196 std::string version_;
199 std::string version_suffix_; 197 std::string version_suffix_;
198
199 base::WeakPtrFactory<EnhancedBookmarkModel> weak_ptr_factory_;
200 }; 200 };
201 201
202 } // namespace enhanced_bookmarks 202 } // namespace enhanced_bookmarks
203 203
204 #endif // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_ 204 #endif // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698