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

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

Issue 179028: Revert "Fix a ton of compiler warnings." (Closed)
Patch Set: Created 11 years, 4 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 | « chrome/browser/history/history_types.h ('k') | chrome/browser/icon_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 38124aa241ea72e874f24cdc2474d9a6d68c1068..b56bcd9ad4ec8234440787c7e4f636cf58f56747 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -545,10 +545,10 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
// Create the bookmark bar and other folder nodes.
history::StarredEntry entry;
entry.type = history::StarredEntry::BOOKMARK_BAR;
- BookmarkNode bookmark_bar_node(0, GURL());
+ BookmarkNode bookmark_bar_node(NULL, GURL());
bookmark_bar_node.Reset(entry);
entry.type = history::StarredEntry::OTHER;
- BookmarkNode other_node(0, GURL());
+ BookmarkNode other_node(NULL, GURL());
other_node.Reset(entry);
std::map<history::UIStarID, history::StarID> group_id_to_id_map;
@@ -597,7 +597,7 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
// encountering the details.
// The created nodes are owned by the root node.
- node = new BookmarkNode(0, i->url);
+ node = new BookmarkNode(NULL, i->url);
id_to_node_map[i->id] = node;
}
node->Reset(*i);
@@ -608,7 +608,7 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
BookmarkNode* parent = id_to_node_map[parent_id];
if (!parent) {
// Haven't encountered the parent yet, create it now.
- parent = new BookmarkNode(0, GURL());
+ parent = new BookmarkNode(NULL, GURL());
id_to_node_map[parent_id] = parent;
}
« no previous file with comments | « chrome/browser/history/history_types.h ('k') | chrome/browser/icon_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698