| Index: content/child/fileapi/webfilesystem_impl.h
|
| diff --git a/content/child/fileapi/webfilesystem_impl.h b/content/child/fileapi/webfilesystem_impl.h
|
| index 5998efd9f98c0a1109986ec0bc0bf3f3c1e6821f..d37f9a3165bc72955b0018562ecfbad2c985dbd1 100644
|
| --- a/content/child/fileapi/webfilesystem_impl.h
|
| +++ b/content/child/fileapi/webfilesystem_impl.h
|
| @@ -18,7 +18,7 @@ namespace base {
|
| class MessageLoopProxy;
|
| }
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebURL;
|
| class WebFileWriter;
|
| class WebFileWriterClient;
|
| @@ -27,7 +27,7 @@ class WebFileWriterClient;
|
| namespace content {
|
|
|
| class WebFileSystemImpl
|
| - : public WebKit::WebFileSystem,
|
| + : public blink::WebFileSystem,
|
| public webkit_glue::WorkerTaskRunner::Observer,
|
| public base::NonThreadSafe {
|
| public:
|
| @@ -50,64 +50,64 @@ class WebFileSystemImpl
|
|
|
| // WebFileSystem implementation.
|
| virtual void openFileSystem(
|
| - const WebKit::WebURL& storage_partition,
|
| - const WebKit::WebFileSystemType type,
|
| - WebKit::WebFileSystemCallbacks);
|
| + const blink::WebURL& storage_partition,
|
| + const blink::WebFileSystemType type,
|
| + blink::WebFileSystemCallbacks);
|
| virtual void resolveURL(
|
| - const WebKit::WebURL& filesystem_url,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& filesystem_url,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void deleteFileSystem(
|
| - const WebKit::WebURL& storage_partition,
|
| - const WebKit::WebFileSystemType type,
|
| - WebKit::WebFileSystemCallbacks);
|
| + const blink::WebURL& storage_partition,
|
| + const blink::WebFileSystemType type,
|
| + blink::WebFileSystemCallbacks);
|
| virtual void move(
|
| - const WebKit::WebURL& src_path,
|
| - const WebKit::WebURL& dest_path,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& src_path,
|
| + const blink::WebURL& dest_path,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void copy(
|
| - const WebKit::WebURL& src_path,
|
| - const WebKit::WebURL& dest_path,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& src_path,
|
| + const blink::WebURL& dest_path,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void remove(
|
| - const WebKit::WebURL& path,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& path,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void removeRecursively(
|
| - const WebKit::WebURL& path,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& path,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void readMetadata(
|
| - const WebKit::WebURL& path,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& path,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void createFile(
|
| - const WebKit::WebURL& path,
|
| + const blink::WebURL& path,
|
| bool exclusive,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void createDirectory(
|
| - const WebKit::WebURL& path,
|
| + const blink::WebURL& path,
|
| bool exclusive,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void fileExists(
|
| - const WebKit::WebURL& path,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& path,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void directoryExists(
|
| - const WebKit::WebURL& path,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& path,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void readDirectory(
|
| - const WebKit::WebURL& path,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& path,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void createFileWriter(
|
| - const WebKit::WebURL& path,
|
| - WebKit::WebFileWriterClient*,
|
| - WebKit::WebFileSystemCallbacks) OVERRIDE;
|
| + const blink::WebURL& path,
|
| + blink::WebFileWriterClient*,
|
| + blink::WebFileSystemCallbacks) OVERRIDE;
|
| virtual void createSnapshotFileAndReadMetadata(
|
| - const WebKit::WebURL& path,
|
| - WebKit::WebFileSystemCallbacks);
|
| + const blink::WebURL& path,
|
| + blink::WebFileSystemCallbacks);
|
|
|
| - int RegisterCallbacks(const WebKit::WebFileSystemCallbacks& callbacks);
|
| - WebKit::WebFileSystemCallbacks GetAndUnregisterCallbacks(
|
| + int RegisterCallbacks(const blink::WebFileSystemCallbacks& callbacks);
|
| + blink::WebFileSystemCallbacks GetAndUnregisterCallbacks(
|
| int callbacks_id);
|
|
|
| private:
|
| - typedef std::map<int, WebKit::WebFileSystemCallbacks> CallbacksMap;
|
| + typedef std::map<int, blink::WebFileSystemCallbacks> CallbacksMap;
|
|
|
| scoped_refptr<base::MessageLoopProxy> main_thread_loop_;
|
|
|
|
|