Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / local / local_file_sync_context.h

diff --git a/src/chrome/browser/sync_file_system/local/local_file_sync_context.h b/src/chrome/browser/sync_file_system/local/local_file_sync_context.h
index 0549ff9..6a18c81 100644 (file)
--- a/src/chrome/browser/sync_file_system/local/local_file_sync_context.h
+++ b/src/chrome/browser/sync_file_system/local/local_file_sync_context.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -205,8 +206,8 @@ class LocalFileSyncContext
 
  protected:
   // LocalFileSyncStatus::Observer overrides. They are called on IO thread.
-  virtual void OnSyncEnabled(const storage::FileSystemURL& url) OVERRIDE;
-  virtual void OnWriteEnabled(const storage::FileSystemURL& url) OVERRIDE;
+  void OnSyncEnabled(const storage::FileSystemURL& url) override;
+  void OnWriteEnabled(const storage::FileSystemURL& url) override;
 
  private:
   typedef base::Callback<void(base::File::Error result)> StatusCallback;
@@ -215,7 +216,7 @@ class LocalFileSyncContext
   friend class base::RefCountedThreadSafe<LocalFileSyncContext>;
   friend class CannedSyncableFileSystem;
 
-  virtual ~LocalFileSyncContext();
+  ~LocalFileSyncContext() override;
 
   void ShutdownOnIOThread();
 
@@ -225,11 +226,11 @@ class LocalFileSyncContext
   void ScheduleNotifyChangesUpdatedOnIOThread(const base::Closure& callback);
 
   // Called by the internal timer on IO thread to notify changes to UI thread.
-  void NotifyAvailableChangesOnIOThread(const base::Closure& callback);
+  void NotifyAvailableChangesOnIOThread();
 
   // Called from NotifyAvailableChangesOnIOThread.
   void NotifyAvailableChanges(const std::set<GURL>& origins,
-                              const base::Closure& callback);
+                              const std::vector<base::Closure>& callbacks);
 
   // Helper routines for MaybeInitializeFileSystemContext.
   void InitializeFileSystemContextOnIOThread(
@@ -360,6 +361,7 @@ class LocalFileSyncContext
   // Used only on IO thread for available changes notifications.
   base::Time last_notified_changes_;
   scoped_ptr<base::OneShotTimer<LocalFileSyncContext> > timer_on_io_;
+  std::vector<base::Closure> pending_completion_callbacks_;
   std::set<GURL> origins_with_pending_changes_;
 
   // Populated while root directory deletion is being handled for