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

Unified Diff: chrome/browser/webdata/web_data_service_base.cc

Issue 12853004: Move creation of WebDatabaseTable subclasses to WebDatabaseServiceFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error. 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_data_service.cc ('k') | chrome/browser/webdata/web_data_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/web_data_service_base.cc
diff --git a/chrome/browser/webdata/web_data_service_base.cc b/chrome/browser/webdata/web_data_service_base.cc
index ba2cbb4fad7f52430c0e1cd3877b80f5649a0992..d9450b24db9058cf45ebc34d5cf5a5d4ff476be8 100644
--- a/chrome/browser/webdata/web_data_service_base.cc
+++ b/chrome/browser/webdata/web_data_service_base.cc
@@ -27,8 +27,10 @@ using base::Bind;
using base::Time;
using content::BrowserThread;
-WebDataServiceBase::WebDataServiceBase(const ProfileErrorCallback& callback)
+WebDataServiceBase::WebDataServiceBase(const base::FilePath& path,
+ const ProfileErrorCallback& callback)
: db_loaded_(false),
+ path_(path),
profile_error_callback_(callback) {
// WebDataService requires DB thread if instantiated.
// Set WebDataServiceFactory::GetInstance()->SetTestingFactory(&profile, NULL)
@@ -44,8 +46,14 @@ void WebDataServiceBase::ShutdownOnUIThread() {
ShutdownDatabase();
}
-void WebDataServiceBase::Init(const base::FilePath& path) {
- wdbs_.reset(new WebDatabaseService(path));
+void WebDataServiceBase::AddTable(scoped_ptr<WebDatabaseTable> table) {
+ if (!wdbs_.get())
+ wdbs_.reset(new WebDatabaseService(path_));
+ wdbs_->AddTable(table.Pass());
+}
+
+void WebDataServiceBase::Init() {
+ DCHECK(wdbs_.get());
wdbs_->LoadDatabase(Bind(&WebDataServiceBase::DatabaseInitOnDB, this));
}
« no previous file with comments | « chrome/browser/webdata/web_data_service.cc ('k') | chrome/browser/webdata/web_data_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698