diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 21:33:14 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 21:33:14 +0000 |
| commit | 3c217ae1a9677660cacb51a21d88020f5bbb6047 (patch) | |
| tree | 310b576bbcf02b1cb86a2d3b2f945dd75702f04f /content/common/file_system/webfilesystem_callback_dispatcher.cc | |
| parent | 5b5c27201e819227c046ef2f8a434c52865fcb7d (diff) | |
| download | chromium_src-3c217ae1a9677660cacb51a21d88020f5bbb6047.zip chromium_src-3c217ae1a9677660cacb51a21d88020f5bbb6047.tar.gz chromium_src-3c217ae1a9677660cacb51a21d88020f5bbb6047.tar.bz2 | |
Revert 80982, tests failing on Win XP
TBR=ericu
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6821020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80991 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.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.cc b/content/common/file_system/webfilesystem_callback_dispatcher.cc index c59e377..6903f4c 100644 --- a/content/common/file_system/webfilesystem_callback_dispatcher.cc +++ b/content/common/file_system/webfilesystem_callback_dispatcher.cc @@ -10,7 +10,6 @@ #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" @@ -59,9 +58,9 @@ void WebFileSystemCallbackDispatcher::DidReadDirectory( } void WebFileSystemCallbackDispatcher::DidOpenFileSystem( - const std::string& name, const GURL& root) { - callbacks_->didOpenFileSystem( - UTF8ToUTF16(name), UTF8ToUTF16(root.spec())); + const std::string& name, const FilePath& root_path) { + callbacks_->didOpenFileSystem(UTF8ToUTF16(name), + webkit_glue::FilePathToWebString(root_path)); } void WebFileSystemCallbackDispatcher::DidFail( |