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 40c3765b3e5d636c67971493320b0b6fc5b98e96..0a03ead1393b482b8eff8b6abbb9a0f010d8bb89 100644 |
--- a/content/browser/indexed_db/indexed_db_factory.h |
+++ b/content/browser/indexed_db/indexed_db_factory.h |
@@ -17,9 +17,8 @@ |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/strings/string16.h" |
-#include "content/browser/indexed_db/indexed_db_callbacks.h" |
+#include "content/browser/indexed_db/indexed_db_change_handler.h" |
#include "content/browser/indexed_db/indexed_db_database.h" |
-#include "content/browser/indexed_db/indexed_db_database_callbacks.h" |
#include "content/common/content_export.h" |
#include "url/gurl.h" |
#include "url/origin.h" |
@@ -31,7 +30,8 @@ class URLRequestContextGetter; |
namespace content { |
class IndexedDBBackingStore; |
-struct IndexedDBPendingConnection; |
+class IndexedDBPendingConnection; |
+class IndexedDBPendingDelete; |
struct IndexedDBDataLossInfo; |
class CONTENT_EXPORT IndexedDBFactory |
@@ -45,10 +45,10 @@ class CONTENT_EXPORT IndexedDBFactory |
bool forced_close) = 0; |
virtual void GetDatabaseNames( |
- scoped_refptr<IndexedDBCallbacks> callbacks, |
const url::Origin& origin, |
const base::FilePath& data_directory, |
scoped_refptr<net::URLRequestContextGetter> request_context_getter) = 0; |
+ // TODO(cmumford): IndexedDBPendingConnection has the origin now (delete it). |
virtual void Open( |
const base::string16& name, |
std::unique_ptr<IndexedDBPendingConnection> connection, |
@@ -59,7 +59,7 @@ class CONTENT_EXPORT IndexedDBFactory |
virtual void DeleteDatabase( |
const base::string16& name, |
scoped_refptr<net::URLRequestContextGetter> request_context_getter, |
- scoped_refptr<IndexedDBCallbacks> callbacks, |
+ std::unique_ptr<IndexedDBPendingDelete> pending_delete, |
const url::Origin& origin, |
const base::FilePath& data_directory) = 0; |
@@ -86,6 +86,8 @@ class CONTENT_EXPORT IndexedDBFactory |
virtual size_t GetConnectionCount(const url::Origin& origin) const = 0; |
+ virtual IndexedDBContext* context() const = 0; |
+ |
protected: |
friend class base::RefCountedThreadSafe<IndexedDBFactory>; |