Chromium Code Reviews| Index: chrome/browser/devtools/devtools_file_helper.h |
| diff --git a/chrome/browser/devtools/devtools_file_helper.h b/chrome/browser/devtools/devtools_file_helper.h |
| index e97e5bd7e0a04a4530968b5300ae995edd44bff5..facce2ab4f649d08c7320b181ded8cc4f7b3e685 100644 |
| --- a/chrome/browser/devtools/devtools_file_helper.h |
| +++ b/chrome/browser/devtools/devtools_file_helper.h |
| @@ -13,6 +13,7 @@ |
| #include "base/callback.h" |
| #include "base/memory/ref_counted.h" |
| #include "base/memory/weak_ptr.h" |
| +#include "base/string16.h" |
| class Profile; |
| @@ -45,9 +46,12 @@ class DevToolsFileHelper { |
| typedef base::Callback< |
| void(const std::vector<DevToolsFileHelper::FileSystem>&)> |
| RequestFileSystemsCallback; |
| - typedef base::Callback< |
| - void(std::string, const DevToolsFileHelper::FileSystem&)> |
| + typedef base::Callback<void(const DevToolsFileHelper::FileSystem&)> |
| AddFileSystemCallback; |
| + typedef base::Callback<void(const string16&, |
| + const base::Callback<void()>&, |
|
pfeldman
2013/04/25 11:06:01
you could name them for convenience.
|
| + const base::Callback<void()>&)> |
| + ShowInfoBarCallback; |
| // Saves |content| to the file and associates its path with given |url|. |
| // If client is calling this method with given |url| for the first time |
| @@ -73,7 +77,8 @@ class DevToolsFileHelper { |
| // struct to |callback|. Saves file system path to prefs. |
| // If selected folder does not contain magic file, passes error string to |
| // |callback|. |
| - void AddFileSystem(const AddFileSystemCallback& callback); |
| + void AddFileSystem(const AddFileSystemCallback& callback, |
| + const ShowInfoBarCallback& show_info_bar_callback); |
| // Loads file system paths from prefs, grants permissions and registers |
| // isolated file system for those of them that contain magic file and passes |
| @@ -89,11 +94,13 @@ class DevToolsFileHelper { |
| const SaveCallback& callback, |
| const base::FilePath& path); |
| void SaveAsFileSelectionCanceled(); |
| - void InnerAddFileSystem(const AddFileSystemCallback& callback, |
| - const base::FilePath& path); |
| - void AddValidatedFileSystem( |
| + void InnerAddFileSystem( |
| + const AddFileSystemCallback& callback, |
| + const ShowInfoBarCallback& show_info_bar_callback, |
| + const base::FilePath& path); |
| + void AddUserConfirmedFileSystem( |
| const AddFileSystemCallback& callback, |
| - const std::vector<base::FilePath>& permitted_paths); |
| + const base::FilePath& path); |
| void RestoreValidatedFileSystems( |
| const RequestFileSystemsCallback& callback, |
| const std::vector<base::FilePath>& file_paths); |