diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/common/file_system/file_system_dispatcher.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/common/file_system/file_system_dispatcher.cc')
| -rw-r--r-- | chrome/common/file_system/file_system_dispatcher.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/common/file_system/file_system_dispatcher.cc b/chrome/common/file_system/file_system_dispatcher.cc index dfe23bf..352deb3 100644 --- a/chrome/common/file_system/file_system_dispatcher.cc +++ b/chrome/common/file_system/file_system_dispatcher.cc @@ -41,10 +41,11 @@ bool FileSystemDispatcher::OnMessageReceived(const IPC::Message& msg) { bool FileSystemDispatcher::OpenFileSystem( const GURL& origin_url, fileapi::FileSystemType type, - long long size, fileapi::FileSystemCallbackDispatcher* dispatcher) { + long long size, bool create, + fileapi::FileSystemCallbackDispatcher* dispatcher) { int request_id = dispatchers_.Add(dispatcher); if (!ChildThread::current()->Send(new ViewHostMsg_OpenFileSystemRequest( - request_id, origin_url, type, size))) { + request_id, origin_url, type, size, create))) { dispatchers_.Remove(request_id); // destroys |dispatcher| return false; } @@ -247,7 +248,7 @@ void FileSystemDispatcher::DidReadMetadata( void FileSystemDispatcher::DidReadDirectory( int request_id, - const std::vector<base::file_util_proxy::Entry>& entries, + const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) { fileapi::FileSystemCallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id); |