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

Unified Diff: chrome/browser/file_system/file_system_dispatcher_host.cc

Issue 3394003: Add Worker support for FileSystem API. (Closed)
Patch Set: '' Created 10 years, 3 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/file_system/file_system_dispatcher_host.cc
diff --git a/chrome/browser/file_system/file_system_dispatcher_host.cc b/chrome/browser/file_system/file_system_dispatcher_host.cc
index 385f2a4c663ca2d8238a6536365f7c778d5a31b8..b8dd83bb4980ff52549a7460d6a31e0fb357be95 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.cc
+++ b/chrome/browser/file_system/file_system_dispatcher_host.cc
@@ -7,7 +7,6 @@
#include "base/file_path.h"
#include "base/thread.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/file_system/browser_file_system_callback_dispatcher.h"
@@ -17,19 +16,17 @@
#include "chrome/common/render_messages.h"
#include "chrome/common/render_messages_params.h"
#include "googleurl/src/gurl.h"
-#include "webkit/glue/webkit_glue.h"
// A class to hold an ongoing openFileSystem completion task.
struct OpenFileSystemCompletionTask {
public:
static void Run(
int request_id,
- int routing_id,
const std::string& name,
const FilePath& root_path,
FileSystemDispatcherHost* dispatcher_host) {
// The task is self-destructed.
- new OpenFileSystemCompletionTask(request_id, routing_id, name, root_path,
+ new OpenFileSystemCompletionTask(request_id, name, root_path,
dispatcher_host);
}
@@ -37,24 +34,21 @@ struct OpenFileSystemCompletionTask {
if (error == base::PLATFORM_FILE_OK)
dispatcher_host_->Send(
new ViewMsg_OpenFileSystemRequest_Complete(
- routing_id_, request_id_, true, UTF8ToUTF16(name_),
- webkit_glue::FilePathToWebString(root_path_)));
+ request_id_, true, name_, root_path_));
else
dispatcher_host_->Send(
new ViewMsg_OpenFileSystemRequest_Complete(
- routing_id_, request_id_, false, string16(), string16()));
+ request_id_, false, std::string(), FilePath()));
delete this;
}
private:
OpenFileSystemCompletionTask(
int request_id,
- int routing_id,
const std::string& name,
const FilePath& root_path,
FileSystemDispatcherHost* dispatcher_host)
: request_id_(request_id),
- routing_id_(routing_id),
name_(name),
root_path_(root_path),
dispatcher_host_(dispatcher_host),
@@ -66,7 +60,6 @@ struct OpenFileSystemCompletionTask {
}
int request_id_;
- int routing_id_;
std::string name_;
FilePath root_path_;
scoped_refptr<FileSystemDispatcherHost> dispatcher_host_;
@@ -121,30 +114,29 @@ bool FileSystemDispatcherHost::OnMessageReceived(
}
void FileSystemDispatcherHost::OnOpenFileSystem(
- const ViewHostMsg_OpenFileSystemRequest_Params& params) {
+ int request_id, const GURL& origin_url, fileapi::FileSystemType type,
+ int64 requested_size) {
// TODO(kinuko): hook up ContentSettings cookies type checks.
FilePath root_path;
std::string name;
- if (!context_->GetFileSystemRootPath(params.origin_url,
- params.type,
+ if (!context_->GetFileSystemRootPath(origin_url,
+ type,
&root_path,
&name)) {
Send(new ViewMsg_OpenFileSystemRequest_Complete(
- params.routing_id,
- params.request_id,
+ request_id,
false,
- string16(),
- string16()));
+ std::string(),
+ FilePath()));
return;
}
// Run the completion task that creates the root directory and sends
// back the status code to the dispatcher.
- OpenFileSystemCompletionTask::Run(
- params.request_id, params.routing_id, name, root_path, this);
+ OpenFileSystemCompletionTask::Run(request_id, name, root_path, this);
}
void FileSystemDispatcherHost::OnMove(
« no previous file with comments | « chrome/browser/file_system/file_system_dispatcher_host.h ('k') | chrome/browser/file_system/file_system_host_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698