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

Unified Diff: chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc

Issue 145973016: Support cross-profile copy between Chrome OS Google Drive folders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix. Created 6 years, 10 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/drive/fileapi/file_system_backend_delegate.cc
diff --git a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
index a71993f8b7cb319c58d93d690daf6c8360d2dc63..31a8b06f1f2378ca13d5f3786e61cb40e8940714 100644
--- a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
+++ b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
@@ -9,10 +9,9 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
#include "chrome/browser/chromeos/drive/fileapi/async_file_util.h"
+#include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h"
#include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h"
#include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h"
-#include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "webkit/browser/blob/file_stream_reader.h"
#include "webkit/browser/fileapi/async_file_util.h"
@@ -23,12 +22,8 @@ using content::BrowserThread;
namespace drive {
-FileSystemBackendDelegate::FileSystemBackendDelegate(
- content::BrowserContext* browser_context)
- : profile_id_(Profile::FromBrowserContext(browser_context)),
- async_file_util_(new internal::AsyncFileUtil(
- base::Bind(&util::GetFileSystemByProfileId, profile_id_))) {
- DCHECK(profile_id_);
+FileSystemBackendDelegate::FileSystemBackendDelegate()
+ : async_file_util_(new internal::AsyncFileUtil) {
}
FileSystemBackendDelegate::~FileSystemBackendDelegate() {
@@ -56,7 +51,7 @@ FileSystemBackendDelegate::CreateFileStreamReader(
return scoped_ptr<webkit_blob::FileStreamReader>(
new internal::WebkitFileStreamReaderImpl(
- base::Bind(&util::GetFileSystemByProfileId, profile_id_),
+ base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
context->default_file_task_runner(),
file_path, offset, expected_modification_time));
}
@@ -76,7 +71,7 @@ FileSystemBackendDelegate::CreateFileStreamWriter(
return scoped_ptr<fileapi::FileStreamWriter>(
new internal::WebkitFileStreamWriterImpl(
- base::Bind(&util::GetFileSystemByProfileId, profile_id_),
+ base::Bind(&fileapi_internal::GetFileSystemFromUrl, url),
context->default_file_task_runner(),file_path, offset));
}

Powered by Google App Engine
This is Rietveld 408576698