| Index: chrome/browser/devtools/devtools_window.h
|
| diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
|
| index 3c474512724ad275ab6316de86c2abe0b7d1a80a..735598439d0f3bed0013939b9936aeb9b5c7f9fd 100644
|
| --- a/chrome/browser/devtools/devtools_window.h
|
| +++ b/chrome/browser/devtools/devtools_window.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/devtools/devtools_file_helper.h"
|
| +#include "chrome/browser/devtools/devtools_file_system_helper.h"
|
| #include "chrome/browser/devtools/devtools_toggle_action.h"
|
| #include "content/public/browser/devtools_client_host.h"
|
| #include "content/public/browser/devtools_frontend_host_delegate.h"
|
| @@ -52,7 +53,8 @@ enum DevToolsDockSide {
|
| class DevToolsWindow : private content::NotificationObserver,
|
| private content::WebContentsDelegate,
|
| private content::DevToolsFrontendHostDelegate,
|
| - private DevToolsFileHelper::Delegate {
|
| + private DevToolsFileHelper::Delegate,
|
| + private DevToolsFileSystemHelper::Delegate {
|
| public:
|
| static const char kDevToolsApp[];
|
| static void RegisterUserPrefs(PrefServiceSyncable* prefs);
|
| @@ -142,7 +144,8 @@ class DevToolsWindow : private content::NotificationObserver,
|
| void UpdateTheme();
|
| void AddDevToolsExtensionsToClient();
|
| void CallClientFunction(const std::string& function_name,
|
| - const base::Value* arg);
|
| + const base::Value* arg1 = NULL,
|
| + const base::Value* arg2 = NULL);
|
| // Overridden from content::WebContentsDelegate.
|
| virtual content::WebContents* OpenURLFromTab(
|
| content::WebContents* source,
|
| @@ -182,11 +185,25 @@ class DevToolsWindow : private content::NotificationObserver,
|
| bool save_as) OVERRIDE;
|
| virtual void AppendToFile(const std::string& url,
|
| const std::string& content) OVERRIDE;
|
| + virtual void RequestFileSystemPermissions() OVERRIDE;
|
| + virtual void SelectFolderAndGrantFileSystemPermission() OVERRIDE;
|
| + virtual void RevokeFileSystemPermission(
|
| + const std::string& file_system_path) OVERRIDE;
|
|
|
| // Overridden from DevToolsFileHelper::Delegate
|
| virtual void FileSavedAs(const std::string& url) OVERRIDE;
|
| virtual void AppendedTo(const std::string& url) OVERRIDE;
|
|
|
| + // Overridden from DevToolsFileSystemHelper::Delegate
|
| + virtual void FileSystemPermissionsLoaded(
|
| + std::vector<DevToolsFileSystemHelper::FileSystem> file_systems) OVERRIDE;
|
| + virtual void FileSystemFolderSelected(
|
| + DevToolsFileSystemHelper::FileSystem file_system) OVERRIDE;
|
| + virtual void FileSystemFolderSelectionCanceled() OVERRIDE;
|
| + virtual void FileSystemFolderSelectionError(
|
| + std::string error_string) OVERRIDE;
|
| +
|
| +
|
| void UpdateBrowserToolbar();
|
| bool IsDocked();
|
| static DevToolsDockSide GetDockSideFromPrefs(Profile* profile);
|
| @@ -203,6 +220,7 @@ class DevToolsWindow : private content::NotificationObserver,
|
| content::NotificationRegistrar registrar_;
|
| content::DevToolsClientHost* frontend_host_;
|
| scoped_ptr<DevToolsFileHelper> file_helper_;
|
| + scoped_refptr<DevToolsFileSystemHelper> file_system_helper_;
|
| int width_;
|
| int height_;
|
| DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
|
|
|