diff options
| author | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 16:27:18 +0000 |
|---|---|---|
| committer | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 16:27:18 +0000 |
| commit | 8b8fab971151ba246c0930fa25c68b705f6a6c0b (patch) | |
| tree | 0c6a51a8823d8fa36636e16ffa5e85a480c8716d /chrome/browser/history | |
| parent | 0d75bad6ecfdb9c7611f1001c5a1e9a0347b2337 (diff) | |
| download | chromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.zip chromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.tar.gz chromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.tar.bz2 | |
Linux: fix a bunch of NULL vs. 0 issues spotted by gcc 4.5.
There are more gcc 4.5 issues to be solved so GYP_DEFINES=='werror='
is still required to build with 4.5 even with these changes.
BUG=66652
TEST=compiles with gcc 4.5 and trybots
Review URL: http://codereview.chromium.org/6186008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
| -rw-r--r-- | chrome/browser/history/top_sites.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index 1635523..a1c0a17 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -443,7 +443,7 @@ void TopSites::DiffMostVisited(const MostVisitedURLList& old_list, CancelableRequestProvider::Handle TopSites::StartQueryForMostVisited() { DCHECK(loaded_); if (!profile_) - return NULL; + return 0; HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); // |hs| may be null during unit tests. @@ -454,7 +454,7 @@ CancelableRequestProvider::Handle TopSites::StartQueryForMostVisited() { &cancelable_consumer_, NewCallback(this, &TopSites::OnTopSitesAvailableFromHistory)); } - return NULL; + return 0; } TopSites::~TopSites() { |