summaryrefslogtreecommitdiffstats
path: root/content/common/file_system/webfilesystem_callback_dispatcher.cc
diff options
context:
space:
mode:
authorericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 20:29:19 +0000
committerericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 20:29:19 +0000
commit647a0c2471827a26451a59894059384d0985e88a (patch)
treedeb842d8421f67c681156e2f3d305856ab7795c8 /content/common/file_system/webfilesystem_callback_dispatcher.cc
parent3abdc9c0071d48e308491119cf1bc373ab60ada2 (diff)
downloadchromium_src-647a0c2471827a26451a59894059384d0985e88a.zip
chromium_src-647a0c2471827a26451a59894059384d0985e88a.tar.gz
chromium_src-647a0c2471827a26451a59894059384d0985e88a.tar.bz2
More filesystem cleanup: convert URL-encoded-as-FilePath to actual URL, where
possible without WebKit API changes. The WebKit changes will happen in another CL. BUG=none TEST=none Review URL: http://codereview.chromium.org/6767010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/file_system/webfilesystem_callback_dispatcher.cc')
-rw-r--r--content/common/file_system/webfilesystem_callback_dispatcher.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.cc b/content/common/file_system/webfilesystem_callback_dispatcher.cc
index 6903f4c..c59e377 100644
--- a/content/common/file_system/webfilesystem_callback_dispatcher.cc
+++ b/content/common/file_system/webfilesystem_callback_dispatcher.cc
@@ -10,6 +10,7 @@
#include "base/file_util_proxy.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
+#include "googleurl/src/gurl.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
@@ -58,9 +59,9 @@ void WebFileSystemCallbackDispatcher::DidReadDirectory(
}
void WebFileSystemCallbackDispatcher::DidOpenFileSystem(
- const std::string& name, const FilePath& root_path) {
- callbacks_->didOpenFileSystem(UTF8ToUTF16(name),
- webkit_glue::FilePathToWebString(root_path));
+ const std::string& name, const GURL& root) {
+ callbacks_->didOpenFileSystem(
+ UTF8ToUTF16(name), UTF8ToUTF16(root.spec()));
}
void WebFileSystemCallbackDispatcher::DidFail(