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 38f94fa714fe58301fa3bf6b9e8dff83c893b2a2..874f61dde19c3857ade582361952db978711adec 100644 |
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
@@ -28,6 +28,7 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
#include "webkit/database/database_util.h" |
#include "webkit/glue/webkit_glue.h" |
@@ -49,6 +50,7 @@ using WebKit::WebIDBObjectStore; |
using WebKit::WebIDBTransaction; |
using WebKit::WebSecurityOrigin; |
using WebKit::WebSerializedScriptValue; |
+using WebKit::WebString; |
dgrogan
2012/04/18 01:56:35
Looks like you don't (yet?) need these WebString l
|
using WebKit::WebVector; |
namespace { |
@@ -532,7 +534,7 @@ void IndexedDBDispatcherHost::IndexDispatcherHost::OnStoreName( |
void IndexedDBDispatcherHost::IndexDispatcherHost::OnKeyPath( |
int32 object_id, NullableString16* key_path) { |
parent_->SyncGetter<NullableString16>( |
- &map_, object_id, key_path, &WebIDBIndex::keyPath); |
+ &map_, object_id, key_path, &WebIDBIndex::keyPathString); |
} |
void IndexedDBDispatcherHost::IndexDispatcherHost::OnUnique( |
@@ -710,7 +712,7 @@ void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnName( |
void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnKeyPath( |
int32 object_id, NullableString16* keyPath) { |
parent_->SyncGetter<NullableString16>( |
- &map_, object_id, keyPath, &WebIDBObjectStore::keyPath); |
+ &map_, object_id, keyPath, &WebIDBObjectStore::keyPathString); |
} |
void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnIndexNames( |