content/browser/in_process_webkit/indexed_db_dispatcher_host.cc - Issue 16927005: Use {As,From}UTF16Unsafe instead of file_path_string_conversions.{h,cc}.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

Issue 16927005: Use {As,From}UTF16Unsafe instead of file_path_string_conversions.{h,cc}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 6 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

« no previous file with comments | « content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc ('k') | content/browser/indexed_db/indexed_db_context_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

index c3f126e62c9714f39e0fbd9c712734462ed91bc6..94cc927ac76fa3769e0dbc649b97591f2632574e 100644

--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

@@ -8,6 +8,7 @@

#include "base/bind.h"

#include "base/command_line.h"

+#include "base/files/file_path.h"

#include "base/process.h"

#include "base/process_util.h"

#include "base/strings/utf_string_conversions.h"

@@ -28,7 +29,6 @@

#include "third_party/WebKit/public/platform/WebIDBDatabase.h"

#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"

#include "third_party/WebKit/public/platform/WebIDBDatabaseException.h"

-#include "webkit/base/file_path_string_conversions.h"

#include "webkit/browser/database/database_util.h"

#include "webkit/common/database/database_identifier.h"

@@ -224,7 +224,7 @@ void IndexedDBDispatcherHost::OnIDBFactoryGetDatabaseNames(

new IndexedDBCallbacks<std::vector<string16> >(

this, params.ipc_thread_id, params.ipc_callbacks_id),

WebKit::WebString::fromUTF8(params.database_identifier),

- webkit_base::FilePathToWebString(indexed_db_path));

+ indexed_db_path.AsUTF16Unsafe());

}

void IndexedDBDispatcherHost::OnIDBFactoryOpen(

@@ -254,7 +254,7 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(

new IndexedDBDatabaseCallbacks(

this, params.ipc_thread_id, params.ipc_database_callbacks_id),

WebKit::WebString::fromUTF8(params.database_identifier),

- webkit_base::FilePathToWebString(indexed_db_path));

+ indexed_db_path.AsUTF16Unsafe());

}

void IndexedDBDispatcherHost::OnIDBFactoryDeleteDatabase(

@@ -267,7 +267,7 @@ void IndexedDBDispatcherHost::OnIDBFactoryDeleteDatabase(

new IndexedDBCallbacks<std::vector<char> >(

this, params.ipc_thread_id, params.ipc_callbacks_id),

WebKit::WebString::fromUTF8(params.database_identifier),

- webkit_base::FilePathToWebString(indexed_db_path));

+ indexed_db_path.AsUTF16Unsafe());

}

void IndexedDBDispatcherHost::FinishTransaction(int64 host_transaction_id,