Index: chrome/browser/chromeos/file_system_provider/operations/get_actions.h |
diff --git a/chrome/browser/chromeos/file_system_provider/operations/add_watcher.h b/chrome/browser/chromeos/file_system_provider/operations/get_actions.h |
similarity index 65% |
copy from chrome/browser/chromeos/file_system_provider/operations/add_watcher.h |
copy to chrome/browser/chromeos/file_system_provider/operations/get_actions.h |
index d938744122d9e428da0915a4523ba0214094f98b..80bdb1b063bdcdd51fd0e1b83edfdb7d377fa4ad 100644 |
--- a/chrome/browser/chromeos/file_system_provider/operations/add_watcher.h |
+++ b/chrome/browser/chromeos/file_system_provider/operations/get_actions.h |
@@ -1,9 +1,9 @@ |
-// Copyright 2014 The Chromium Authors. All rights reserved. |
+// Copyright 2015 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_OPERATIONS_ADD_WATCHER_H_ |
-#define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_ADD_WATCHER_H_ |
+#ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_GET_ACTIONS_H_ |
+#define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_GET_ACTIONS_H_ |
#include "base/files/file.h" |
#include "base/memory/scoped_ptr.h" |
@@ -11,7 +11,7 @@ |
#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h" |
#include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h" |
#include "chrome/browser/chromeos/file_system_provider/request_value.h" |
-#include "storage/browser/fileapi/async_file_util.h" |
+#include "chrome/common/extensions/api/file_system_provider_internal.h" |
namespace base { |
class FilePath; |
@@ -25,17 +25,18 @@ namespace chromeos { |
namespace file_system_provider { |
namespace operations { |
-// Adds a watcher. If |recursive| is true, than also watches for all of the |
-// child entries in within, recursively. Recursive must not be set to true for |
-// files. |
-class AddWatcher : public Operation { |
+// Checks whether the passed name is valid or not. |
+bool ValidateName(const std::string& name, bool root_entry); |
+ |
+// Bridge between fileapi get actions operation and providing extension's get |
+// actions request. Created per request. |
+class GetActions : public Operation { |
public: |
- AddWatcher(extensions::EventRouter* event_router, |
+ GetActions(extensions::EventRouter* event_router, |
const ProvidedFileSystemInfo& file_system_info, |
const base::FilePath& entry_path, |
- bool recursive, |
- const storage::AsyncFileUtil::StatusCallback& callback); |
- ~AddWatcher() override; |
+ const ProvidedFileSystemInterface::GetActionsCallback& callback); |
+ ~GetActions() override; |
// Operation overrides. |
bool Execute(int request_id) override; |
@@ -47,15 +48,14 @@ class AddWatcher : public Operation { |
base::File::Error error) override; |
private: |
- const base::FilePath entry_path_; |
- const bool recursive_; |
- const storage::AsyncFileUtil::StatusCallback callback_; |
+ base::FilePath entry_path_; |
+ const ProvidedFileSystemInterface::GetActionsCallback callback_; |
- DISALLOW_COPY_AND_ASSIGN(AddWatcher); |
+ DISALLOW_COPY_AND_ASSIGN(GetActions); |
}; |
} // namespace operations |
} // namespace file_system_provider |
} // namespace chromeos |
-#endif // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_ADD_WATCHER_H_ |
+#endif // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_OPERATIONS_GET_ACTIONS_H_ |