diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 11:05:15 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 11:05:15 +0000 |
| commit | d00f2165f4867e801d5e57c390dc4d402ed7084c (patch) | |
| tree | 3f1d8f830e300756be9fc773c09d4ceb811e949a /content/child/fileapi | |
| parent | e3a89a5d24cd86c3ed3e6cf3a182fd1bdb9fc855 (diff) | |
| download | chromium_src-d00f2165f4867e801d5e57c390dc4d402ed7084c.zip chromium_src-d00f2165f4867e801d5e57c390dc4d402ed7084c.tar.gz chromium_src-d00f2165f4867e801d5e57c390dc4d402ed7084c.tar.bz2 | |
Remove API compatibility hack from WebFileSystemImpl
BUG=347900
TEST=build
Review URL: https://codereview.chromium.org/194033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/fileapi')
| -rw-r--r-- | content/child/fileapi/webfilesystem_impl.cc | 4 | ||||
| -rw-r--r-- | content/child/fileapi/webfilesystem_impl.h | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc index 67f6358..62e9f0e 100644 --- a/content/child/fileapi/webfilesystem_impl.cc +++ b/content/child/fileapi/webfilesystem_impl.cc @@ -554,7 +554,7 @@ void WebFileSystemImpl::directoryExists( waitable_results.get()); } -READ_DIRECTORY_RETURN_TYPE WebFileSystemImpl::readDirectory( +int WebFileSystemImpl::readDirectory( const blink::WebURL& path, WebFileSystemCallbacks callbacks) { int callbacks_id = RegisterCallbacks(callbacks); @@ -569,9 +569,7 @@ READ_DIRECTORY_RETURN_TYPE WebFileSystemImpl::readDirectory( base::Bind(&StatusCallbackAdapter, CurrentWorkerId(), callbacks_id, waitable_results)), waitable_results.get()); -#if defined(READ_DIRECTORY_RETURNS_INT) return callbacks_id; -#endif } void WebFileSystemImpl::createFileWriter( diff --git a/content/child/fileapi/webfilesystem_impl.h b/content/child/fileapi/webfilesystem_impl.h index e5348db..3be7463 100644 --- a/content/child/fileapi/webfilesystem_impl.h +++ b/content/child/fileapi/webfilesystem_impl.h @@ -14,13 +14,6 @@ #include "content/child/worker_task_runner.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" -// TODO(hashimoto): Remove this hack. -#if defined(READ_DIRECTORY_RETURNS_INT) -#define READ_DIRECTORY_RETURN_TYPE int -#else -#define READ_DIRECTORY_RETURN_TYPE void -#endif - namespace base { class MessageLoopProxy; class WaitableEvent; @@ -100,7 +93,7 @@ class WebFileSystemImpl : public blink::WebFileSystem, virtual void directoryExists( const blink::WebURL& path, blink::WebFileSystemCallbacks) OVERRIDE; - virtual READ_DIRECTORY_RETURN_TYPE readDirectory( + virtual int readDirectory( const blink::WebURL& path, blink::WebFileSystemCallbacks) OVERRIDE; virtual void createFileWriter( |