[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_INTERFACE_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_INTERFACE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(EntryMetadata);
 };
 
 // Interface for a provided file system. Acts as a proxy between providers
 // and clients. All of the request methods return an abort callback in order to
 // terminate it while running. They must be called on the same thread as the
 // request methods. The cancellation callback may be null if the operation
 // fails synchronously.
 class ProvidedFileSystemInterface {
  public:
-  struct ChildChange;
+  struct Change;
 
   // Mode of opening a file. Used by OpenFile().
   enum OpenFileMode { OPEN_FILE_MODE_READ, OPEN_FILE_MODE_WRITE };
 
   // Extra fields to be fetched with metadata.
   enum MetadataField {
     METADATA_FIELD_DEFAULT = 0,
     METADATA_FIELD_THUMBNAIL = 1 << 0
   };
 
@@ skipping 107 matching lines @@
   // Requests observing a directory.
   virtual AbortCallback ObserveDirectory(
       const base::FilePath& directory_path,
       bool recursive,
       const storage::AsyncFileUtil::StatusCallback& callback) = 0;
 
   // Requests unobserving an entry, which is immediately removed from the
   // internal list, hence the operation is not abortable.
   virtual void UnobserveEntry(
       const base::FilePath& entry_path,
+      bool recursive,
       const storage::AsyncFileUtil::StatusCallback& callback) = 0;
 
   // Notifies about changes to the observed entries within the file system.
   // Invoked by the file system implementation. Returns false if the
   // notification arguments are malformed or the entry is not observed anymore.
-  virtual bool Notify(
-      const base::FilePath& observed_path,
-      ProvidedFileSystemObserver::ChangeType change_type,
-      scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
-      const std::string& tag) = 0;
+  virtual bool Notify(const base::FilePath& observed_path,
+                      bool recursive,
+                      ProvidedFileSystemObserver::ChangeType change_type,
+                      scoped_ptr<ProvidedFileSystemObserver::Changes> changes,
+                      const std::string& tag) = 0;
 
   // Returns a provided file system info for this file system.
   virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const = 0;
 
   // Returns a mutable list of observed entries.
   virtual ObservedEntries* GetObservedEntries() = 0;
 
   // Returns a request manager for the file system.
   virtual RequestManager* GetRequestManager() = 0;
 
   // Adds an observer on the file system.
   virtual void AddObserver(ProvidedFileSystemObserver* observer) = 0;
 
   // Removes an observer.
   virtual void RemoveObserver(ProvidedFileSystemObserver* observer) = 0;
 
   // Returns a weak pointer to this object.
   virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() = 0;
 };
 
 }  // namespace file_system_provider
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_INTERFACE_H_