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

Unified Diff: chrome/browser/chromeos/extensions/file_handler_util.cc

Issue 10692146: Fix more incorrect usage of BrowserContext on the FILE thread. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix yet another misuse Created 8 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
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/file_handler_util.cc
===================================================================
--- chrome/browser/chromeos/extensions/file_handler_util.cc (revision 145946)
+++ chrome/browser/chromeos/extensions/file_handler_util.cc (working copy)
@@ -380,6 +380,7 @@
typedef std::vector<FileDefinition> FileDefinitionList;
class ExecuteTasksFileSystemCallbackDispatcher;
void RequestFileEntryOnFileThread(
+ scoped_refptr<fileapi::FileSystemContext> file_system_context,
const GURL& handler_base_url,
const scoped_refptr<const extensions::Extension>& handler,
int handler_pid,
@@ -474,7 +475,7 @@
public:
static fileapi::FileSystemContext::OpenFileSystemCallback CreateCallback(
ExtensionTaskExecutor* executor,
- Profile* profile,
+ scoped_refptr<fileapi::FileSystemContext> file_system_context,
const GURL& source_url,
scoped_refptr<const Extension> handler_extension,
int handler_pid,
@@ -483,7 +484,7 @@
return base::Bind(
&ExecuteTasksFileSystemCallbackDispatcher::DidOpenFileSystem,
base::Owned(new ExecuteTasksFileSystemCallbackDispatcher(
- executor, profile, source_url, handler_extension,
+ executor, file_system_context, source_url, handler_extension,
handler_pid, action_id, file_urls)));
}
@@ -539,14 +540,14 @@
private:
ExecuteTasksFileSystemCallbackDispatcher(
ExtensionTaskExecutor* executor,
- Profile* profile,
+ scoped_refptr<fileapi::FileSystemContext> file_system_context,
const GURL& source_url,
const scoped_refptr<const Extension>& handler_extension,
int handler_pid,
const std::string& action_id,
const std::vector<GURL>& file_urls)
: executor_(executor),
- profile_(profile),
+ file_system_context_(file_system_context),
source_url_(source_url),
handler_extension_(handler_extension),
handler_pid_(handler_pid),
@@ -577,7 +578,7 @@
return false;
fileapi::ExternalFileSystemMountPointProvider* external_provider =
- BrowserContext::GetFileSystemContext(profile_)->external_provider();
+ file_system_context_->external_provider();
if (!external_provider)
return false;
@@ -635,7 +636,7 @@
}
ExtensionTaskExecutor* executor_;
- Profile* profile_;
+ scoped_refptr<fileapi::FileSystemContext> file_system_context_;
// Extension source URL.
GURL source_url_;
scoped_refptr<const Extension> handler_extension_;
@@ -680,11 +681,14 @@
done_ = done;
// Get local file system instance on file thread.
+ scoped_refptr<fileapi::FileSystemContext> file_system_context =
+ BrowserContext::GetFileSystemContext(profile());
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(
&ExtensionTaskExecutor::RequestFileEntryOnFileThread,
this,
+ file_system_context,
Extension::GetBaseURLFromExtensionId(handler->id()),
handler,
handler_pid,
@@ -693,17 +697,18 @@
}
void ExtensionTaskExecutor::RequestFileEntryOnFileThread(
+ scoped_refptr<fileapi::FileSystemContext> file_system_context,
const GURL& handler_base_url,
const scoped_refptr<const Extension>& handler,
int handler_pid,
const std::vector<GURL>& file_urls) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
GURL origin_url = handler_base_url.GetOrigin();
- BrowserContext::GetFileSystemContext(profile())->OpenFileSystem(
+ file_system_context->OpenFileSystem(
origin_url, fileapi::kFileSystemTypeExternal, false, // create
ExecuteTasksFileSystemCallbackDispatcher::CreateCallback(
this,
- profile(),
+ file_system_context,
source_url_,
handler,
handler_pid,
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698