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

Unified Diff: content/common/file_system/webfilesystem_callback_dispatcher.cc

Issue 6904063: String->URL cleanup, chromium-side. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 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: content/common/file_system/webfilesystem_callback_dispatcher.cc
diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.cc b/content/common/file_system/webfilesystem_callback_dispatcher.cc
index c59e3779c708018c4f96ae1d746aff6473ac14e3..6003eab50adf8e01daf04e20ee5a1cd39937356a 100644
--- a/content/common/file_system/webfilesystem_callback_dispatcher.cc
+++ b/content/common/file_system/webfilesystem_callback_dispatcher.cc
@@ -15,12 +15,14 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
#include "webkit/glue/webkit_glue.h"
using WebKit::WebFileInfo;
using WebKit::WebFileSystemCallbacks;
using WebKit::WebFileSystemEntry;
using WebKit::WebString;
+using WebKit::WebURL;
using WebKit::WebVector;
WebFileSystemCallbackDispatcher::WebFileSystemCallbackDispatcher(
@@ -60,8 +62,10 @@ void WebFileSystemCallbackDispatcher::DidReadDirectory(
void WebFileSystemCallbackDispatcher::DidOpenFileSystem(
const std::string& name, const GURL& root) {
- callbacks_->didOpenFileSystem(
- UTF8ToUTF16(name), UTF8ToUTF16(root.spec()));
+ //TODO(ericu): This should keep making the old string call for now,
+ //then we'll add the new call to webkit, then we'll convert this call, then
+ //we'll remove the old call from webkit.
+ callbacks_->didOpenFileSystem(UTF8ToUTF16(name), WebURL(root));
}
void WebFileSystemCallbackDispatcher::DidFail(
« no previous file with comments | « no previous file | content/common/file_system/webfilesystem_impl.h » ('j') | webkit/tools/test_shell/simple_file_system.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698