Files.app: Provide detailed change information on onDirectoryChanged event

chrome/browser/chromeos/drive/file_system/remove_operation.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/remove_operation.h"
 
 #include "base/sequenced_task_runner.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/operation_observer.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace file_system {
 
 namespace {
 
 // Removes cache file and moves the metadata entry to the trash.
 FileError UpdateLocalState(internal::ResourceMetadata* metadata,
                            internal::FileCache* cache,
                            const base::FilePath& path,
                            bool is_recursive,
                            std::string* local_id,
-                           base::FilePath* changed_directory_path) {
+                           base::FilePath* changed_path) {
   FileError error = metadata->GetIdByPath(path, local_id);
   if (error != FILE_ERROR_OK)
     return error;
 
   ResourceEntry entry;
   error = metadata->GetResourceEntryById(*local_id, &entry);
   if (error != FILE_ERROR_OK)
     return error;
 
   if (entry.file_info().is_directory() && !is_recursive) {
     // Check emptiness of the directory.
     ResourceEntryVector entries;
     error = metadata->ReadDirectoryByPath(path, &entries);
     if (error != FILE_ERROR_OK)
       return error;
     if (!entries.empty())
       return FILE_ERROR_NOT_EMPTY;
   }
 
   error = cache->Remove(*local_id);
   if (error != FILE_ERROR_OK)
     return error;
 
-  *changed_directory_path = path.DirName();
+  *changed_path = path;
 
   // Move to the trash.
   entry.set_parent_local_id(util::kDriveTrashDirLocalId);
   return metadata->RefreshEntry(entry);
 }
 
 }  // namespace
 
 RemoveOperation::RemoveOperation(
     base::SequencedTaskRunner* blocking_task_runner,
@@ skipping 12 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 void RemoveOperation::Remove(const base::FilePath& path,
                              bool is_recursive,
                              const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   std::string* local_id = new std::string;
-  base::FilePath* changed_directory_path = new base::FilePath;
+  base::FilePath* changed_path = new base::FilePath;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&UpdateLocalState,
                  metadata_,
                  cache_,
                  path,
                  is_recursive,
                  local_id,
-                 changed_directory_path),
+                 changed_path),
       base::Bind(&RemoveOperation::RemoveAfterUpdateLocalState,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback,
                  base::Owned(local_id),
-                 base::Owned(changed_directory_path)));
+                 base::Owned(changed_path)));
 }
 
 void RemoveOperation::RemoveAfterUpdateLocalState(
     const FileOperationCallback& callback,
     const std::string* local_id,
-    const base::FilePath* changed_directory_path,
+    const base::FilePath* changed_path,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  if (error == FILE_ERROR_OK) {
-    observer_->OnDirectoryChangedByOperation(*changed_directory_path);
-    observer_->OnEntryUpdatedByOperation(*local_id);
+  ResourceEntry entry;
+  FileError error2 = metadata_->GetResourceEntryById(*local_id, &entry);

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

this is violating thread restriction (metadata must be accessed on
blocking_task_runner_.

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

Done.

+  DCHECK(error2 == FILE_ERROR_OK);
+
+  if (!changed_path->empty()) {
+    FileChange changed_file;
+    changed_file.Update(*changed_path, entry, FileChange::DELETE);
+    if (error == FILE_ERROR_OK) {
+      observer_->OnDirectoryChangedByOperation(changed_file);
+      observer_->OnEntryUpdatedByOperation(*local_id);
+    }
   }
 
   callback.Run(error);
 }
 
 }  // namespace file_system
 }  // namespace drive