content/browser/indexed_db/indexed_db_factory.h - Issue 16870007: Switch database/file_identifier to std::string, remove createFromDatabaseIdentifier calls

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/indexed_db/indexed_db_factory.h

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

« content/browser/indexed_db/indexed_db_backing_store.h ('K') | « content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc ('k') | content/browser/indexed_db/indexed_db_factory.cc » ('j') | content/browser/indexed_db/indexed_db_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/indexed_db/indexed_db_factory.h

diff --git a/content/browser/indexed_db/indexed_db_factory.h b/content/browser/indexed_db/indexed_db_factory.h

index 64eeb226e59209c87eb299215ead433a61c7596f..8d1bb3d0817746a51de468b03e552465ec44997f 100644

--- a/content/browser/indexed_db/indexed_db_factory.h

+++ b/content/browser/indexed_db/indexed_db_factory.h

@@ -34,19 +34,19 @@ class CONTENT_EXPORT IndexedDBFactory

void RemoveIDBDatabaseBackend(const string16& unique_identifier);

void GetDatabaseNames(scoped_refptr<IndexedDBCallbacksWrapper> callbacks,

- const string16& database_identifier,

+ const std::string& origin_identifier,

const base::FilePath& data_directory);

void Open(const string16& name,

int64 version,

int64 transaction_id,

scoped_refptr<IndexedDBCallbacksWrapper> callbacks,

scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,

- const string16& database_identifier,

+ const std::string& origin_identifier,

const base::FilePath& data_directory);

void DeleteDatabase(const string16& name,

scoped_refptr<IndexedDBCallbacksWrapper> callbacks,

- const string16& database_identifier,

+ const std::string& origin_identifier,

const base::FilePath& data_directory);

protected:

@@ -56,7 +56,7 @@ class CONTENT_EXPORT IndexedDBFactory

virtual ~IndexedDBFactory();

scoped_refptr<IndexedDBBackingStore> OpenBackingStore(

- const string16& database_identifier,

+ const std::string& origin_identifier,

const base::FilePath& data_directory);

private:

@@ -64,7 +64,7 @@ class CONTENT_EXPORT IndexedDBFactory

IndexedDBDatabaseMap;

IndexedDBDatabaseMap database_backend_map_;

- typedef std::map<string16, base::WeakPtr<IndexedDBBackingStore> >

+ typedef std::map<std::string, base::WeakPtr<IndexedDBBackingStore> >

IndexedDBBackingStoreMap;

IndexedDBBackingStoreMap backing_store_map_;