| Index: net/base/directory_lister.cc
|
| diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
|
| index 841f454c814bafa3865fc92c69304f75f2a36aa4..427b69c359b9cb526ac4a7734010ccb9cca5c649 100644
|
| --- a/net/base/directory_lister.cc
|
| +++ b/net/base/directory_lister.cc
|
| @@ -87,8 +87,7 @@ void SortData(std::vector<DirectoryLister::DirectoryListerData>* data,
|
|
|
| DirectoryLister::DirectoryLister(const base::FilePath& dir,
|
| DirectoryListerDelegate* delegate)
|
| - : core_(new Core(dir, false, ALPHA_DIRS_FIRST, this)),
|
| - delegate_(delegate) {
|
| + : core_(new Core(dir, false, ALPHA_DIRS_FIRST, this)), delegate_(delegate) {
|
| DCHECK(delegate_);
|
| DCHECK(!dir.value().empty());
|
| }
|
| @@ -97,8 +96,7 @@ DirectoryLister::DirectoryLister(const base::FilePath& dir,
|
| bool recursive,
|
| SortType sort,
|
| DirectoryListerDelegate* delegate)
|
| - : core_(new Core(dir, recursive, sort, this)),
|
| - delegate_(delegate) {
|
| + : core_(new Core(dir, recursive, sort, this)), delegate_(delegate) {
|
| DCHECK(delegate_);
|
| DCHECK(!dir.value().empty());
|
| }
|
| @@ -119,14 +117,12 @@ DirectoryLister::Core::Core(const base::FilePath& dir,
|
| bool recursive,
|
| SortType sort,
|
| DirectoryLister* lister)
|
| - : dir_(dir),
|
| - recursive_(recursive),
|
| - sort_(sort),
|
| - lister_(lister) {
|
| + : dir_(dir), recursive_(recursive), sort_(sort), lister_(lister) {
|
| DCHECK(lister_);
|
| }
|
|
|
| -DirectoryLister::Core::~Core() {}
|
| +DirectoryLister::Core::~Core() {
|
| +}
|
|
|
| bool DirectoryLister::Core::Start() {
|
| origin_loop_ = base::MessageLoopProxy::current();
|
| @@ -140,7 +136,6 @@ void DirectoryLister::Core::Cancel() {
|
| }
|
|
|
| void DirectoryLister::Core::StartInternal() {
|
| -
|
| if (!base::DirectoryExists(dir_)) {
|
| origin_loop_->PostTask(
|
| FROM_HERE,
|
| @@ -180,12 +175,10 @@ void DirectoryLister::Core::StartInternal() {
|
|
|
| SortData(&file_data, sort_);
|
| origin_loop_->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&DirectoryLister::Core::SendData, this, file_data));
|
| + FROM_HERE, base::Bind(&DirectoryLister::Core::SendData, this, file_data));
|
|
|
| - origin_loop_->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&DirectoryLister::Core::OnDone, this, OK));
|
| + origin_loop_->PostTask(FROM_HERE,
|
| + base::Bind(&DirectoryLister::Core::OnDone, this, OK));
|
| }
|
|
|
| void DirectoryLister::Core::SendData(
|
|
|