drive: Call OnDirectoryChanged from EntryRevertPerformer

chrome/browser/chromeos/drive/sync/entry_revert_performer.cc

 // Copyright 2013 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/sync/entry_revert_performer.h"
 
 #include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace internal {
 namespace {
 
 FileError FinishRevert(ResourceMetadata* metadata,
                        const std::string& local_id,
                        google_apis::GDataErrorCode status,
-                       scoped_ptr<google_apis::ResourceEntry> resource_entry) {
+                       scoped_ptr<google_apis::ResourceEntry> resource_entry,
+                       std::vector<base::FilePath>* changed_directories) {
   FileError error = GDataToFileError(status);
   if (error == FILE_ERROR_NOT_FOUND)
     return metadata->RemoveEntry(local_id);
 
   if (error != FILE_ERROR_OK)
     return error;
 
   ResourceEntry entry;
   std::string parent_resource_id;
   if (!ConvertToResourceEntry(*resource_entry, &entry, &parent_resource_id))
     return FILE_ERROR_NOT_A_FILE;
 
   if (entry.deleted())
     return metadata->RemoveEntry(local_id);
 
   std::string parent_local_id;
   error = metadata->GetIdByResourceId(parent_resource_id, &parent_local_id);
   if (error != FILE_ERROR_OK)
     return error;
 
+  const base::FilePath original_path = metadata->GetFilePath(local_id);
+
   entry.set_local_id(local_id);
   entry.set_parent_local_id(parent_local_id);
 
-  return metadata->RefreshEntry(entry);
+  error = metadata->RefreshEntry(entry);
+  if (error != FILE_ERROR_OK)
+    return error;
+
+  changed_directories->push_back(original_path.DirName());
+  changed_directories->push_back(metadata->GetFilePath(parent_local_id));
+
+  return FILE_ERROR_OK;
 }
 
 }  // namespace
 
 EntryRevertPerformer::EntryRevertPerformer(
     base::SequencedTaskRunner* blocking_task_runner,
+    file_system::OperationObserver* observer,
     JobScheduler* scheduler,
     ResourceMetadata* metadata)
     : blocking_task_runner_(blocking_task_runner),
+      observer_(observer),
       scheduler_(scheduler),
       metadata_(metadata),
       weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 EntryRevertPerformer::~EntryRevertPerformer() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
@@ skipping 32 matching lines @@
       base::Bind(&EntryRevertPerformer::RevertEntryAfterGetResourceEntry,
                  weak_ptr_factory_.GetWeakPtr(), callback, entry->local_id()));
 }
 
 void EntryRevertPerformer::RevertEntryAfterGetResourceEntry(
     const FileOperationCallback& callback,
     const std::string& local_id,
     google_apis::GDataErrorCode status,
     scoped_ptr<google_apis::ResourceEntry> resource_entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
 
-  // TODO(hashimoto): Notify OnDirectoryChanged event for affected directories.
+  std::vector<base::FilePath>* changed_directories =

[kinaba, 2013/12/06 07:04:05]

Wouldn't it better be std::set? otherwise duplicated notification may be sent.

[hashimoto, 2013/12/06 07:36:20]

Done.
We should also fix MoveOperation?

[kinaba, 2013/12/06 07:41:40]

Sounds good to do so.

+      new std::vector<base::FilePath>;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&FinishRevert, metadata_, local_id, status,
-                 base::Passed(&resource_entry)),
-      callback);
+                 base::Passed(&resource_entry), changed_directories),
+      base::Bind(&EntryRevertPerformer::RevertEntryAfterFinishRevert,
+                 weak_ptr_factory_.GetWeakPtr(), callback,
+                 base::Owned(changed_directories)));
+}
+
+void EntryRevertPerformer::RevertEntryAfterFinishRevert(
+    const FileOperationCallback& callback,
+    const std::vector<base::FilePath>* changed_directories,
+    FileError error) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+
+  for (size_t i = 0; i < changed_directories->size(); ++i)
+    observer_->OnDirectoryChangedByOperation((*changed_directories)[i]);
+
+  callback.Run(error);
 }
 
 }  // namespace internal
 }  // namespace drive