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

Unified Diff: chrome/browser/history/starred_url_database.cc

Issue 7316013: history: Move kBookmarkBarID constant out of HistoryService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: after friends Created 9 years, 5 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: chrome/browser/history/starred_url_database.cc
diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
index a774ecab34404e758ed823fa9e7b94a9744cd913..e75c01384a63db56c88dc1fc8900e9588c3eabc8 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -115,6 +115,9 @@ void ResetBookmarkNode(const history::StarredEntry& entry,
} // namespace
+// static
+const int64 StarredURLDatabase::kBookmarkBarID = 1;
+
StarredURLDatabase::StarredURLDatabase() {
}
@@ -606,9 +609,8 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
}
// Register the bookmark bar and other folder nodes in the maps.
- id_to_node_map[HistoryService::kBookmarkBarID] = &bookmark_bar_node;
- folder_id_to_id_map[HistoryService::kBookmarkBarID] =
- HistoryService::kBookmarkBarID;
+ id_to_node_map[kBookmarkBarID] = &bookmark_bar_node;
+ folder_id_to_id_map[kBookmarkBarID] = kBookmarkBarID;
if (other_folder_folder_id) {
id_to_node_map[other_folder_id] = &other_node;
folder_id_to_id_map[other_folder_folder_id] = other_folder_id;
« no previous file with comments | « chrome/browser/history/starred_url_database.h ('k') | chrome/browser/history/starred_url_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698