diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 20:41:10 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 20:41:10 +0000 |
commit | be952c3ca6d93968409b246c9439a7d8c2a06bba (patch) | |
tree | 501d38ada79c1fddf10f65fe6c88b27a3df4cb1d /chrome/browser/history/starred_url_database.cc | |
parent | 86c008e8a7da9c00c5a676eb201ba5d0c976748e (diff) | |
download | chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.zip chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.gz chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.bz2 |
Fix a ton of compiler warnings.
Most of these are classes with virtual methods lacking virtual destructors
or NULL used in non-pointer context.
BUG=none
TEST=app_unittests && base_unittests
--gtest_filter=-ConditionVariableTest.LargeFastTaskTest
patch by Jacob Mandelson <jlmjlm [at] gmail>
http://codereview.chromium.org/171028/show
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/starred_url_database.cc')
-rw-r--r-- | chrome/browser/history/starred_url_database.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc index b56bcd9..38124aa2 100644 --- a/chrome/browser/history/starred_url_database.cc +++ b/chrome/browser/history/starred_url_database.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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(NULL, GURL()); + BookmarkNode bookmark_bar_node(0, GURL()); bookmark_bar_node.Reset(entry); entry.type = history::StarredEntry::OTHER; - BookmarkNode other_node(NULL, GURL()); + BookmarkNode other_node(0, 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(NULL, i->url); + node = new BookmarkNode(0, 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(NULL, GURL()); + parent = new BookmarkNode(0, GURL()); id_to_node_map[parent_id] = parent; } |