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

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

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 // Helper method for setting multiple meta info fields at once. All the fields 196 // Helper method for setting multiple meta info fields at once. All the fields
197 // in |meta_info| will be set, but the method will not delete fields not 197 // in |meta_info| will be set, but the method will not delete fields not
198 // present. 198 // present.
199 void SetMultipleMetaInfo(const bookmarks::BookmarkNode* node, 199 void SetMultipleMetaInfo(const bookmarks::BookmarkNode* node,
200 bookmarks::BookmarkNode::MetaInfoMap meta_info); 200 bookmarks::BookmarkNode::MetaInfoMap meta_info);
201 201
202 bookmarks::BookmarkModel* bookmark_model_; 202 bookmarks::BookmarkModel* bookmark_model_;
203 bool loaded_; 203 bool loaded_;
204 204
205 ObserverList<EnhancedBookmarkModelObserver> observers_; 205 base::ObserverList<EnhancedBookmarkModelObserver> observers_;
206 206
207 IdToNodeMap id_map_; 207 IdToNodeMap id_map_;
208 NodeToIdMap nodes_to_reset_; 208 NodeToIdMap nodes_to_reset_;
209 209
210 // Caches the remote id of a node before its meta info changes. 210 // Caches the remote id of a node before its meta info changes.
211 std::string prev_remote_id_; 211 std::string prev_remote_id_;
212 212
213 std::string version_; 213 std::string version_;
214 std::string version_suffix_; 214 std::string version_suffix_;
215 215
216 base::WeakPtrFactory<EnhancedBookmarkModel> weak_ptr_factory_; 216 base::WeakPtrFactory<EnhancedBookmarkModel> weak_ptr_factory_;
217 }; 217 };
218 218
219 } // namespace enhanced_bookmarks 219 } // namespace enhanced_bookmarks
220 220
221 #endif // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_ 221 #endif // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_
OLDNEW
« no previous file with comments | « components/enhanced_bookmarks/bookmark_server_service.h ('k') | components/favicon/core/favicon_driver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698