summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 13:43:42 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 13:43:42 +0000
commit659f73fa7b0a91ceef30e89fff34629f39853761 (patch)
tree54856047a10c8ba93f82c725cb0e3ee5283e707d /net/base
parentb2be7a6889ea1af900760b6e69e22152f652e950 (diff)
downloadchromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.zip
chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.tar.gz
chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.tar.bz2
Turn NULL used as int to 0.
(Excluding chrome/browser/...) Landing patch for Jacob Mandelson. Original review: http://codereview.chromium.org/195067 BUG=none TEST=base_unittests & app_unittests Review URL: http://codereview.chromium.org/267076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/directory_lister.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index 7ea862f..8204fd8 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -55,7 +55,7 @@ DirectoryLister::DirectoryLister(const FilePath& dir,
: dir_(dir),
delegate_(delegate),
message_loop_(NULL),
- thread_(NULL),
+ thread_(kNullThreadHandle),
canceled_(false) {
DCHECK(!dir.value().empty());
}
@@ -88,7 +88,7 @@ void DirectoryLister::Cancel() {
if (thread_) {
PlatformThread::Join(thread_);
- thread_ = NULL;
+ thread_ = kNullThreadHandle;
}
}