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

Unified Diff: chrome/browser/chromeos/file_system_provider/provided_file_system.cc

Issue 663713002: [fsp] Extract ObservedEntry and ObservedEntries to a separate file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Added missing files. Created 6 years, 2 months 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/chromeos/file_system_provider/provided_file_system.cc
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
index c5c1b2a002f5da6704805a27f4eff798ebaf063b..e358e1d6824f0d5e0dafb45288b402d05dcab471 100644
--- a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
+++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
@@ -407,9 +407,10 @@ void ProvidedFileSystem::UnobserveEntry(
// by the C++ layer, not by the extension.
observed_entries_.erase(it);
- FOR_EACH_OBSERVER(ProvidedFileSystemObserver,
- observers_,
- OnObservedEntryListChanged(file_system_info_));
+ FOR_EACH_OBSERVER(
+ ProvidedFileSystemObserver,
+ observers_,
+ OnObservedEntryListChanged(file_system_info_, observed_entries_));
// TODO(mtomasz): Consider returning always an OK error code, since for the
// callers it's important that the entry is not watched anymore. The watcher
@@ -431,7 +432,7 @@ RequestManager* ProvidedFileSystem::GetRequestManager() {
return request_manager_.get();
}
-ProvidedFileSystem::ObservedEntries* ProvidedFileSystem::GetObservedEntries() {
+ObservedEntries* ProvidedFileSystem::GetObservedEntries() {
return &observed_entries_;
}
@@ -517,9 +518,10 @@ void ProvidedFileSystem::OnObserveDirectoryCompleted(
observed_entries_[directory_path].entry_path = directory_path;
observed_entries_[directory_path].recursive |= recursive;
- FOR_EACH_OBSERVER(ProvidedFileSystemObserver,
- observers_,
- OnObservedEntryListChanged(file_system_info_));
+ FOR_EACH_OBSERVER(
+ ProvidedFileSystemObserver,
+ observers_,
+ OnObservedEntryListChanged(file_system_info_, observed_entries_));
callback.Run(result);
}
@@ -550,7 +552,7 @@ void ProvidedFileSystem::OnNotifyCompleted(
FOR_EACH_OBSERVER(
ProvidedFileSystemObserver,
observers_,
- OnObservedEntryTagUpdated(file_system_info_, observed_path));
+ OnObservedEntryTagUpdated(file_system_info_, observed_path, tag));
// If the observed entry is deleted, then unobserve it.
if (change_type == ProvidedFileSystemObserver::DELETED)

Powered by Google App Engine
This is Rietveld 408576698