Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2259)

Unified Diff: chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc

Issue 1093383002: [WIP] Provided file system from NACL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved several modules to chromeos folder. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc
index a4e9a782d18497e646c6dbb005358227cb9b3fe6..dac0b6b3b49c8a8147f71f91b79fba115b3f8a74 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.cc
@@ -42,7 +42,8 @@ BackendDelegate::~BackendDelegate() {}
storage::AsyncFileUtil* BackendDelegate::GetAsyncFileUtil(
storage::FileSystemType type) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- DCHECK_EQ(storage::kFileSystemTypeProvided, type);
+ DCHECK(storage::kFileSystemTypeProvided == type ||
+ storage::kFileSystemTypePluginProvided == type);
return async_file_util_.get();
}
@@ -53,7 +54,8 @@ scoped_ptr<storage::FileStreamReader> BackendDelegate::CreateFileStreamReader(
const base::Time& expected_modification_time,
storage::FileSystemContext* context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
+ DCHECK(storage::kFileSystemTypeProvided == url.type() ||
+ storage::kFileSystemTypePluginProvided == url.type());
return scoped_ptr<storage::FileStreamReader>(new BufferingFileStreamReader(
scoped_ptr<storage::FileStreamReader>(new FileStreamReader(
@@ -67,7 +69,8 @@ scoped_ptr<storage::FileStreamWriter> BackendDelegate::CreateFileStreamWriter(
int64 offset,
storage::FileSystemContext* context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
+ DCHECK(storage::kFileSystemTypeProvided == url.type() ||
+ storage::kFileSystemTypePluginProvided == url.type());
return scoped_ptr<storage::FileStreamWriter>(new BufferingFileStreamWriter(
scoped_ptr<storage::FileStreamWriter>(new FileStreamWriter(url, offset)),
@@ -77,7 +80,8 @@ scoped_ptr<storage::FileStreamWriter> BackendDelegate::CreateFileStreamWriter(
storage::WatcherManager* BackendDelegate::GetWatcherManager(
storage::FileSystemType type) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- DCHECK_EQ(storage::kFileSystemTypeProvided, type);
+ DCHECK(storage::kFileSystemTypeProvided == type ||
+ storage::kFileSystemTypePluginProvided == type);
return watcher_manager_.get();
}
@@ -85,7 +89,8 @@ void BackendDelegate::GetRedirectURLForContents(
const storage::FileSystemURL& url,
const storage::URLCallback& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- DCHECK_EQ(storage::kFileSystemTypeProvided, url.type());
+ DCHECK(storage::kFileSystemTypeProvided == url.type() ||
+ storage::kFileSystemTypePluginProvided == url.type() );
callback.Run(GURL());
}

Powered by Google App Engine
This is Rietveld 408576698