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

Unified Diff: content/browser/indexed_db/webidbfactory_impl.cc

Issue 16870007: Switch database/file_identifier to std::string, remove createFromDatabaseIdentifier calls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: content/browser/indexed_db/webidbfactory_impl.cc
diff --git a/content/browser/indexed_db/webidbfactory_impl.cc b/content/browser/indexed_db/webidbfactory_impl.cc
index 17f646601466393fd797f0c57de6d2ba225af3ff..973fcc42cc3a0f6776a24bf2ea1c31e856ed9e36 100644
--- a/content/browser/indexed_db/webidbfactory_impl.cc
+++ b/content/browser/indexed_db/webidbfactory_impl.cc
@@ -8,6 +8,7 @@
#include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
#include "content/browser/indexed_db/indexed_db_factory.h"
#include "content/browser/indexed_db/indexed_db_factory.h"
+#include "third_party/WebKit/public/platform/WebCString.h"
#include "third_party/WebKit/public/platform/WebIDBDatabaseError.h"
#include "webkit/base/file_path_string_conversions.h"
@@ -25,7 +26,7 @@ void WebIDBFactoryImpl::getDatabaseNames(IndexedDBCallbacksBase* callbacks,
const WebString& data_dir) {
idb_factory_backend_->GetDatabaseNames(
IndexedDBCallbacksWrapper::Create(callbacks),
- database_identifier,
+ database_identifier.utf8(),
jsbell 2013/06/20 16:38:40 Despite the name, these WebIDB*Impl files no longe
jamesr 2013/06/20 16:54:32 In fact, it looks like the caller is taking a std:
webkit_base::WebStringToFilePath(data_dir));
}
@@ -47,7 +48,7 @@ void WebIDBFactoryImpl::open(const WebString& name,
transaction_id,
callbacks_proxy.get(),
database_callbacks_proxy.get(),
- database_identifier,
+ database_identifier.utf8(),
webkit_base::WebStringToFilePath(data_dir));
}
@@ -58,7 +59,7 @@ void WebIDBFactoryImpl::deleteDatabase(const WebString& name,
idb_factory_backend_->DeleteDatabase(
name,
IndexedDBCallbacksWrapper::Create(callbacks),
- database_identifier,
+ database_identifier.utf8(),
webkit_base::WebStringToFilePath(data_dir));
}

Powered by Google App Engine
This is Rietveld 408576698