diff options
author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
---|---|---|
committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
tree | 195485454c93125455a30e553a73981c3816144d /WebKit/chromium/public/WebKitClient.h | |
parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'WebKit/chromium/public/WebKitClient.h')
-rw-r--r-- | WebKit/chromium/public/WebKitClient.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/WebKit/chromium/public/WebKitClient.h b/WebKit/chromium/public/WebKitClient.h index 5959a1c..4104175 100644 --- a/WebKit/chromium/public/WebKitClient.h +++ b/WebKit/chromium/public/WebKitClient.h @@ -33,6 +33,7 @@ #include "WebCommon.h" #include "WebData.h" +#include "WebFileSystem.h" #include "WebLocalizedString.h" #include "WebString.h" #include "WebURL.h" @@ -49,7 +50,7 @@ class WebApplicationCacheHost; class WebApplicationCacheHostClient; class WebClipboard; class WebCookieJar; -class WebFileSystem; +class WebFileUtilities; class WebGLES2Context; class WebGraphicsContext3D; class WebIDBFactory; @@ -72,8 +73,13 @@ public: virtual WebMimeRegistry* mimeRegistry() { return 0; } // Must return non-null. + // FIXME: Clean up this one once the renaming to WebFileUtilities is done. virtual WebFileSystem* fileSystem() { return 0; } + // Must return non-null. + // FIXME: Clean up this one once the renaming from WebFileSystem is done. + virtual WebFileUtilities* fileUtilities() { return fileSystem(); } + // May return null if sandbox support is not necessary virtual WebSandboxSupport* sandboxSupport() { return 0; } |