| Index: content/browser/file_system/file_system_dispatcher_host.cc
|
| ===================================================================
|
| --- content/browser/file_system/file_system_dispatcher_host.cc (revision 81454)
|
| +++ content/browser/file_system/file_system_dispatcher_host.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -57,9 +57,10 @@
|
| }
|
|
|
| virtual void DidOpenFileSystem(const std::string& name,
|
| - const FilePath& path) {
|
| + const GURL& root) {
|
| dispatcher_host_->Send(
|
| - new FileSystemMsg_OpenComplete(request_id_, !path.empty(), name, path));
|
| + new FileSystemMsg_OpenComplete(
|
| + request_id_, root.is_valid(), name, root));
|
| }
|
|
|
| virtual void DidFail(base::PlatformFileError error_code) {
|
| @@ -137,7 +138,7 @@
|
| // TODO(kinuko): Need to notify the UI thread to indicate that
|
| // there's a blocked content.
|
| Send(new FileSystemMsg_OpenComplete(
|
| - request_id, false, std::string(), FilePath()));
|
| + request_id, false, std::string(), GURL()));
|
| return;
|
| }
|
|
|
| @@ -145,27 +146,27 @@
|
| }
|
|
|
| void FileSystemDispatcherHost::OnMove(
|
| - int request_id, const FilePath& src_path, const FilePath& dest_path) {
|
| + int request_id, const GURL& src_path, const GURL& dest_path) {
|
| GetNewOperation(request_id)->Move(src_path, dest_path);
|
| }
|
|
|
| void FileSystemDispatcherHost::OnCopy(
|
| - int request_id, const FilePath& src_path, const FilePath& dest_path) {
|
| + int request_id, const GURL& src_path, const GURL& dest_path) {
|
| GetNewOperation(request_id)->Copy(src_path, dest_path);
|
| }
|
|
|
| void FileSystemDispatcherHost::OnRemove(
|
| - int request_id, const FilePath& path, bool recursive) {
|
| + int request_id, const GURL& path, bool recursive) {
|
| GetNewOperation(request_id)->Remove(path, recursive);
|
| }
|
|
|
| void FileSystemDispatcherHost::OnReadMetadata(
|
| - int request_id, const FilePath& path) {
|
| + int request_id, const GURL& path) {
|
| GetNewOperation(request_id)->GetMetadata(path);
|
| }
|
|
|
| void FileSystemDispatcherHost::OnCreate(
|
| - int request_id, const FilePath& path, bool exclusive,
|
| + int request_id, const GURL& path, bool exclusive,
|
| bool is_directory, bool recursive) {
|
| if (is_directory)
|
| GetNewOperation(request_id)->CreateDirectory(path, exclusive, recursive);
|
| @@ -174,7 +175,7 @@
|
| }
|
|
|
| void FileSystemDispatcherHost::OnExists(
|
| - int request_id, const FilePath& path, bool is_directory) {
|
| + int request_id, const GURL& path, bool is_directory) {
|
| if (is_directory)
|
| GetNewOperation(request_id)->DirectoryExists(path);
|
| else
|
| @@ -182,13 +183,13 @@
|
| }
|
|
|
| void FileSystemDispatcherHost::OnReadDirectory(
|
| - int request_id, const FilePath& path) {
|
| + int request_id, const GURL& path) {
|
| GetNewOperation(request_id)->ReadDirectory(path);
|
| }
|
|
|
| void FileSystemDispatcherHost::OnWrite(
|
| int request_id,
|
| - const FilePath& path,
|
| + const GURL& path,
|
| const GURL& blob_url,
|
| int64 offset) {
|
| GetNewOperation(request_id)->Write(
|
| @@ -197,14 +198,14 @@
|
|
|
| void FileSystemDispatcherHost::OnTruncate(
|
| int request_id,
|
| - const FilePath& path,
|
| + const GURL& path,
|
| int64 length) {
|
| GetNewOperation(request_id)->Truncate(path, length);
|
| }
|
|
|
| void FileSystemDispatcherHost::OnTouchFile(
|
| int request_id,
|
| - const FilePath& path,
|
| + const GURL& path,
|
| const base::Time& last_access_time,
|
| const base::Time& last_modified_time) {
|
| GetNewOperation(request_id)->TouchFile(
|
|
|