projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
media_galleries
/
media_folder_finder.cc
diff --git
a/src/chrome/browser/media_galleries/media_folder_finder.cc
b/src/chrome/browser/media_galleries/media_folder_finder.cc
index
74f8d05
..
1d72012
100644
(file)
--- a/
src/chrome/browser/media_galleries/media_folder_finder.cc
+++ b/
src/chrome/browser/media_galleries/media_folder_finder.cc
@@
-7,8
+7,8
@@
#include <algorithm>
#include <set>
#include <algorithm>
#include <set>
-#include "base/file_util.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_enumerator.h"
+#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/sequence_checker.h"
#include "base/stl_util.h"
#include "base/path_service.h"
#include "base/sequence_checker.h"
#include "base/stl_util.h"
@@
-417,10
+417,10
@@
void MediaFolderFinder::ScanFolder() {
base::FilePath folder_to_scan = folders_to_scan_.back();
folders_to_scan_.pop_back();
base::PostTaskAndReplyWithResult(
base::FilePath folder_to_scan = folders_to_scan_.back();
folders_to_scan_.pop_back();
base::PostTaskAndReplyWithResult(
- worker_task_runner_
, FROM_HERE
,
-
base::Bind(&Worker::ScanFolder
,
- base::Unretained(worker_),
-
folder_to_scan),
+ worker_task_runner_
.get()
,
+
FROM_HERE
,
+ base::Bind(
+
&Worker::ScanFolder, base::Unretained(worker_),
folder_to_scan),
base::Bind(&MediaFolderFinder::GotScanResults,
weak_factory_.GetWeakPtr(),
folder_to_scan));
base::Bind(&MediaFolderFinder::GotScanResults,
weak_factory_.GetWeakPtr(),
folder_to_scan));