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

Unified Diff: components/sync_bookmarks/bookmark_model_associator.cc

Issue 2461463002: [Sync] Replacing NULL with nullptr/null throughout sync code. (Closed)
Patch Set: Reverted PROFILE_nullptr mistake. Created 4 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
« no previous file with comments | « components/sync_bookmarks/bookmark_model_associator.h ('k') | components/sync_sessions/favicon_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_bookmarks/bookmark_model_associator.cc
diff --git a/components/sync_bookmarks/bookmark_model_associator.cc b/components/sync_bookmarks/bookmark_model_associator.cc
index cc8532c4c1ca68c6fb912a69c33aea08129a1bb2..8db093d1e03416f36dd40831f0cad769ab69a077 100644
--- a/components/sync_bookmarks/bookmark_model_associator.cc
+++ b/components/sync_bookmarks/bookmark_model_associator.cc
@@ -74,7 +74,7 @@ class BookmarkNodeFinder {
explicit BookmarkNodeFinder(const BookmarkNode* parent_node);
// Finds the bookmark node that matches the given url, title and folder
- // attribute. Returns the matching node if one exists; NULL otherwise.
+ // attribute. Returns the matching node if one exists; null otherwise.
// If there are multiple matches then a node with ID matching |preferred_id|
// is returned; otherwise the first matching node is returned.
// If a matching node is found, it's removed for further matches.
@@ -340,7 +340,7 @@ int64_t BookmarkModelAssociator::GetSyncIdFromChromeId(const int64_t& node_id) {
const BookmarkNode* BookmarkModelAssociator::GetChromeNodeFromSyncId(
int64_t sync_id) {
SyncIdToBookmarkNodeMap::const_iterator iter = id_map_inverse_.find(sync_id);
- return iter == id_map_inverse_.end() ? NULL : iter->second;
+ return iter == id_map_inverse_.end() ? nullptr : iter->second;
}
bool BookmarkModelAssociator::InitSyncNodeFromChromeId(
« no previous file with comments | « components/sync_bookmarks/bookmark_model_associator.h ('k') | components/sync_sessions/favicon_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698