[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/provided_file_system.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_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 124 matching lines @@
       net::IOBuffer* buffer,
       int64 offset,
       int length,
       const storage::AsyncFileUtil::StatusCallback& callback) override;
   virtual AbortCallback ObserveDirectory(
       const base::FilePath& directory_path,
       bool recursive,
       const storage::AsyncFileUtil::StatusCallback& callback) override;
   virtual void UnobserveEntry(
       const base::FilePath& entry_path,
+      bool recursive,
       const storage::AsyncFileUtil::StatusCallback& callback) override;
   virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const override;
   virtual RequestManager* GetRequestManager() override;
   virtual ObservedEntries* GetObservedEntries() override;
   virtual void AddObserver(ProvidedFileSystemObserver* observer) override;
   virtual void RemoveObserver(ProvidedFileSystemObserver* observer) override;
-  virtual bool Notify(
-      const base::FilePath& observed_path,
-      ProvidedFileSystemObserver::ChangeType change_type,
-      scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
-      const std::string& tag) override;
+  virtual bool Notify(const base::FilePath& observed_path,
+                      bool recursive,
+                      ProvidedFileSystemObserver::ChangeType change_type,
+                      scoped_ptr<ProvidedFileSystemObserver::Changes> changes,
+                      const std::string& tag) override;
   virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() override;
 
  private:
   // Aborts an operation executed with a request id equal to
   // |operation_request_id|. The request is removed immediately on the C++ side
   // despite being handled by the providing extension or not.
   void Abort(int operation_request_id,
              const storage::AsyncFileUtil::StatusCallback& callback);
 
   // Called when a directory becomes watched successfully.
   void OnObserveDirectoryCompleted(
       const base::FilePath& directory_path,
       bool recursive,
       const storage::AsyncFileUtil::StatusCallback& callback,
       base::File::Error result);
 
   // Called when all observers finished handling the change notification. It
   // updates the tag from |last_tag| to |tag| for the entry at |observed_path|.
   void OnNotifyCompleted(
       const base::FilePath& observed_path,
+      bool recursive,
       ProvidedFileSystemObserver::ChangeType change_type,
-      scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
+      scoped_ptr<ProvidedFileSystemObserver::Changes> changes,
       const std::string& last_tag,
       const std::string& tag);
 
   Profile* profile_;                       // Not owned.
   extensions::EventRouter* event_router_;  // Not owned. May be NULL.
   ProvidedFileSystemInfo file_system_info_;
   scoped_ptr<NotificationManagerInterface> notification_manager_;
   scoped_ptr<RequestManager> request_manager_;
   ObservedEntries observed_entries_;
   ObserverList<ProvidedFileSystemObserver> observers_;
 
   base::WeakPtrFactory<ProvidedFileSystem> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ProvidedFileSystem);
 };
 
 }  // namespace file_system_provider
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_PROVIDED_FILE_SYSTEM_H_