| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/webdata/web_data_service_factory.h" | 5 #include "chrome/browser/webdata/web_data_service_factory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/profiles/profile_dependency_manager.h" | 10 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 | 54 |
| 55 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) { | 55 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) { |
| 56 base::FilePath path = profile->GetPath(); | 56 base::FilePath path = profile->GetPath(); |
| 57 path = path.Append(kWebDataFilename); | 57 path = path.Append(kWebDataFilename); |
| 58 | 58 |
| 59 web_database_ = new WebDatabaseService(path); | 59 web_database_ = new WebDatabaseService(path); |
| 60 | 60 |
| 61 // All tables objects that participate in managing the database must | 61 // All tables objects that participate in managing the database must |
| 62 // be added here. | 62 // be added here. |
| 63 web_database_->AddTable( | 63 web_database_->AddTable( |
| 64 scoped_ptr<WebDatabaseTable>(new AutofillTable())); | 64 scoped_ptr<WebDatabaseTable>(new AutofillTable( |
| 65 g_browser_process->GetApplicationLocale()))); |
| 65 web_database_->AddTable( | 66 web_database_->AddTable( |
| 66 scoped_ptr<WebDatabaseTable>(new KeywordTable())); | 67 scoped_ptr<WebDatabaseTable>(new KeywordTable())); |
| 67 // TODO(mdm): We only really need the LoginsTable on Windows for IE7 password | 68 // TODO(mdm): We only really need the LoginsTable on Windows for IE7 password |
| 68 // access, but for now, we still create it on all platforms since it deletes | 69 // access, but for now, we still create it on all platforms since it deletes |
| 69 // the old logins table. We can remove this after a while, e.g. in M22 or so. | 70 // the old logins table. We can remove this after a while, e.g. in M22 or so. |
| 70 web_database_->AddTable( | 71 web_database_->AddTable( |
| 71 scoped_ptr<WebDatabaseTable>(new LoginsTable())); | 72 scoped_ptr<WebDatabaseTable>(new LoginsTable())); |
| 72 web_database_->AddTable( | 73 web_database_->AddTable( |
| 73 scoped_ptr<WebDatabaseTable>(new TokenServiceTable())); | 74 scoped_ptr<WebDatabaseTable>(new TokenServiceTable())); |
| 74 web_database_->AddTable( | 75 web_database_->AddTable( |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 } | 186 } |
| 186 | 187 |
| 187 ProfileKeyedService* | 188 ProfileKeyedService* |
| 188 WebDataServiceFactory::BuildServiceInstanceFor(Profile* profile) const { | 189 WebDataServiceFactory::BuildServiceInstanceFor(Profile* profile) const { |
| 189 return new WebDataServiceWrapper(profile); | 190 return new WebDataServiceWrapper(profile); |
| 190 } | 191 } |
| 191 | 192 |
| 192 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const { | 193 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const { |
| 193 return true; | 194 return true; |
| 194 } | 195 } |
| OLD | NEW |