Files.app: Provide detailed change information on onDirectoryChanged event

chrome/browser/chromeos/drive/file_system.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/file_system.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/directory_loader.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
+#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/copy_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/download_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/open_file_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/search_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/touch_operation.h"
@@ skipping 758 matching lines @@
 
   drive::internal::SearchMetadata(blocking_task_runner_,
                                   resource_metadata_,
                                   query,
                                   options,
                                   at_most_num_matches,
                                   callback);
 }
 
 void FileSystem::OnDirectoryChangedByOperation(
-    const base::FilePath& directory_path) {
-  OnDirectoryChanged(directory_path);
+    const FileChange& changed_files) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  OnDirectoryChanged(changed_files);
 }
 
 void FileSystem::OnEntryUpdatedByOperation(const std::string& local_id) {
   sync_client_->AddUpdateTask(ClientContext(USER_INITIATED), local_id);
 }
 
 void FileSystem::OnDriveSyncError(file_system::DriveSyncErrorType type,
                                   const std::string& local_id) {
   base::FilePath* file_path = new base::FilePath;
   base::PostTaskAndReplyWithResult(
@@ skipping 13 matching lines @@
     file_system::DriveSyncErrorType type,
     const base::FilePath* file_path,
     FileError error) {
   if (error != FILE_ERROR_OK)
     return;
   FOR_EACH_OBSERVER(FileSystemObserver,
                     observers_,
                     OnDriveSyncError(type, *file_path));
 }
 
-void FileSystem::OnDirectoryChanged(const base::FilePath& directory_path) {
+void FileSystem::OnDirectoryReloaded(const base::FilePath& directory_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  FOR_EACH_OBSERVER(FileSystemObserver, observers_,
-                    OnDirectoryChanged(directory_path));
+  FOR_EACH_OBSERVER(
+      FileSystemObserver, observers_, OnDirectoryChanged(directory_path, NULL));
+}
+
+void FileSystem::OnDirectoryChanged(const FileChange& changed_files) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  typedef std::map<base::FilePath, FileChange> FileChangeMap;
+
+  FileChangeMap map;
+  const FileChange::Map& changed_file_map = changed_files.map();
+  for (FileChange::Map::const_iterator it = changed_file_map.begin();
+       it != changed_file_map.end();
+       it++) {
+    const base::FilePath& path = it->first;
+    map[path.DirName()].Update(path, it->second);
+  }
+

[kinaba, 2014/06/23 05:37:43]

What about moving this dispatch-by-directory code to EventRouter and keep
drive::FileSystem to simply pass FileChange as is?

Since EventRouter is the place currently caring which path is watched, I guess
it will be more natural to have path-dependent screening in that layer, and
besides it'll be probably better for Bug 243634, 232994, etc.

[yoshiki, 2014/06/24 02:02:22]

Done.

+  for (FileChangeMap::const_iterator it = map.begin(); it != map.end(); it++) {
+    FOR_EACH_OBSERVER(FileSystemObserver,
+                      observers_,
+                      OnDirectoryChanged(it->first, &(it->second)));
+  }
 }
 
 void FileSystem::OnLoadFromServerComplete() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   sync_client_->StartCheckingExistingPinnedFiles();
 }
 
 void FileSystem::OnInitialLoadComplete() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 132 matching lines @@
       FROM_HERE,
       base::Bind(&GetPathFromResourceIdOnBlockingPool,
                  resource_metadata_,
                  resource_id,
                  file_path),
       base::Bind(&GetPathFromResourceIdAfterGetPath,
                  base::Owned(file_path),
                  callback));
 }
 }  // namespace drive