summaryrefslogtreecommitdiffstats
path: root/content/child
diff options
context:
space:
mode:
authorjsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 01:03:25 +0000
committerjsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 01:03:25 +0000
commitaffe4c6bcdce03a13758cd3404c001c66e099098 (patch)
tree2a89de8609927e898a5da6fa4a2f2e02e67ce82f /content/child
parented132f5aee6b6ae77d1d2de2425ed60d9786086e (diff)
downloadchromium_src-affe4c6bcdce03a13758cd3404c001c66e099098.zip
chromium_src-affe4c6bcdce03a13758cd3404c001c66e099098.tar.gz
chromium_src-affe4c6bcdce03a13758cd3404c001c66e099098.tar.bz2
IndexedDB: Remove uses of WebKit API types from back-end code
Clean up almost everything except for enums. BUG=233361,237267 Review URL: https://chromiumcodereview.appspot.com/17915004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child')
-rw-r--r--content/child/indexed_db/indexed_db_dispatcher.cc10
-rw-r--r--content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc1
2 files changed, 8 insertions, 3 deletions
diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc
index edd64cf..b6e57ea 100644
--- a/content/child/indexed_db/indexed_db_dispatcher.cc
+++ b/content/child/indexed_db/indexed_db_dispatcher.cc
@@ -643,7 +643,10 @@ void IndexedDBDispatcher::OnError(int32 ipc_thread_id,
WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_callbacks_id);
if (!callbacks)
return;
- callbacks->onError(WebIDBDatabaseError(code, message));
+ if (message.empty())
+ callbacks->onError(WebIDBDatabaseError(code));
+ else
+ callbacks->onError(WebIDBDatabaseError(code, message));
pending_callbacks_.Remove(ipc_callbacks_id);
}
@@ -657,7 +660,10 @@ void IndexedDBDispatcher::OnAbort(int32 ipc_thread_id,
pending_database_callbacks_.Lookup(ipc_database_callbacks_id);
if (!callbacks)
return;
- callbacks->onAbort(transaction_id, WebIDBDatabaseError(code, message));
+ if (message.empty())
+ callbacks->onAbort(transaction_id, WebIDBDatabaseError(code));
+ else
+ callbacks->onAbort(transaction_id, WebIDBDatabaseError(code, message));
}
void IndexedDBDispatcher::OnComplete(int32 ipc_thread_id,
diff --git a/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc b/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
index cb07345..5c0e586 100644
--- a/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
+++ b/content/child/indexed_db/proxy_webidbcursor_impl_unittest.cc
@@ -16,7 +16,6 @@
using WebKit::WebData;
using WebKit::WebIDBCallbacks;
using WebKit::WebIDBDatabase;
-using WebKit::WebIDBDatabaseError;
using WebKit::WebIDBKey;
namespace content {