Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3362)

Unified Diff: chrome/browser/media_galleries/fileapi/iapps_data_provider.h

Issue 2518053002: Always delete media galleries FilePathWatchers on the FILE thread. (Closed)
Patch Set: fix build error Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media_galleries/fileapi/iapps_data_provider.h
diff --git a/chrome/browser/media_galleries/fileapi/iapps_data_provider.h b/chrome/browser/media_galleries/fileapi/iapps_data_provider.h
index f7c320aec61882168f5d4d0c4608f4e069a4fcc1..b35ac00242824244b221e02a3d3f2716aba6648f 100644
--- a/chrome/browser/media_galleries/fileapi/iapps_data_provider.h
+++ b/chrome/browser/media_galleries/fileapi/iapps_data_provider.h
@@ -15,6 +15,7 @@
#include "base/files/file_path_watcher.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
+#include "chrome/browser/media_galleries/fileapi/file_path_watcher_util.h"
namespace iapps {
@@ -53,8 +54,7 @@ class IAppsDataProvider {
private:
// Called when the FilePathWatcher for |library_path_| has tried to add an
// watch.
- void OnLibraryWatchStarted(
- std::unique_ptr<base::FilePathWatcher> library_watcher);
+ void OnLibraryWatchStarted(MediaFilePathWatcherUniquePtr library_watcher);
// Path to the library XML file.
const base::FilePath library_path_;
@@ -67,7 +67,7 @@ class IAppsDataProvider {
bool is_valid_;
// A watcher on the library xml file.
- std::unique_ptr<base::FilePathWatcher> library_watcher_;
+ MediaFilePathWatcherUniquePtr library_watcher_;
base::WeakPtrFactory<IAppsDataProvider> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698