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

Unified Diff: chrome/browser/webdata/web_database.h

Issue 12518017: Generalize migration code in WebDatabase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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
« no previous file with comments | « chrome/browser/webdata/web_apps_table.cc ('k') | chrome/browser/webdata/web_database.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/web_database.h
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index 5fdb6075ed1df0b8227135cd9d3c530cffc98bba..3b47d2ae877df72872f3ad47b416809d75bbba7d 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_WEBDATA_WEB_DATABASE_H_
#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
#include "sql/connection.h"
#include "sql/init_status.h"
#include "sql/meta_table.h"
@@ -15,6 +16,7 @@ class KeywordTable;
class LoginsTable;
class TokenServiceTable;
class WebAppsTable;
+class WebDatabaseTable;
class WebIntentsTable;
namespace base {
@@ -67,13 +69,20 @@ class WebDatabase {
sql::Connection db_;
sql::MetaTable meta_table_;
- scoped_ptr<AutofillTable> autofill_table_;
- scoped_ptr<KeywordTable> keyword_table_;
- scoped_ptr<LoginsTable> logins_table_;
- scoped_ptr<TokenServiceTable> token_service_table_;
- scoped_ptr<WebAppsTable> web_apps_table_;
+ // TODO(joi): All of the typed pointers are going in a future
+ // change, as we remove knowledge of the specific types from this
+ // class.
+ AutofillTable* autofill_table_;
+ KeywordTable* keyword_table_;
+ LoginsTable* logins_table_;
+ TokenServiceTable* token_service_table_;
+ WebAppsTable* web_apps_table_;
// TODO(thakis): Add a migration to delete this table, then remove this.
- scoped_ptr<WebIntentsTable> web_intents_table_;
+ WebIntentsTable* web_intents_table_;
+
+ // Owns all the different database tables that have been added to
+ // this object.
+ ScopedVector<WebDatabaseTable> tables_;
scoped_ptr<content::NotificationService> notification_service_;
« no previous file with comments | « chrome/browser/webdata/web_apps_table.cc ('k') | chrome/browser/webdata/web_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698