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/profiles/profile_dependency_manager.h" | 10 #include "chrome/browser/profiles/profile_dependency_manager.h" |
10 #include "chrome/browser/ui/profile_error_dialog.h" | 11 #include "chrome/browser/ui/profile_error_dialog.h" |
11 #include "chrome/browser/webdata/autocomplete_syncable_service.h" | 12 #include "chrome/browser/webdata/autocomplete_syncable_service.h" |
12 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" | 13 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" |
13 #include "chrome/browser/webdata/keyword_table.h" | 14 #include "chrome/browser/webdata/keyword_table.h" |
14 #include "chrome/browser/webdata/logins_table.h" | 15 #include "chrome/browser/webdata/logins_table.h" |
15 #include "chrome/browser/webdata/token_service_table.h" | 16 #include "chrome/browser/webdata/token_service_table.h" |
16 #include "chrome/browser/webdata/web_apps_table.h" | 17 #include "chrome/browser/webdata/web_apps_table.h" |
17 #include "chrome/browser/webdata/web_data_service.h" | 18 #include "chrome/browser/webdata/web_data_service.h" |
18 #include "chrome/browser/webdata/web_intents_table.h" | 19 #include "chrome/browser/webdata/web_intents_table.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 | 52 |
52 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) { | 53 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) { |
53 base::FilePath path = profile->GetPath(); | 54 base::FilePath path = profile->GetPath(); |
54 path = path.Append(kWebDataFilename); | 55 path = path.Append(kWebDataFilename); |
55 | 56 |
56 web_database_ = new WebDatabaseService(path); | 57 web_database_ = new WebDatabaseService(path); |
57 | 58 |
58 // All tables objects that participate in managing the database must | 59 // All tables objects that participate in managing the database must |
59 // be added here. | 60 // be added here. |
60 web_database_->AddTable( | 61 web_database_->AddTable( |
61 scoped_ptr<WebDatabaseTable>(new AutofillTable())); | 62 scoped_ptr<WebDatabaseTable>(new AutofillTable( |
| 63 g_browser_process->GetApplicationLocale()))); |
62 web_database_->AddTable( | 64 web_database_->AddTable( |
63 scoped_ptr<WebDatabaseTable>(new KeywordTable())); | 65 scoped_ptr<WebDatabaseTable>(new KeywordTable())); |
64 // TODO(mdm): We only really need the LoginsTable on Windows for IE7 password | 66 // TODO(mdm): We only really need the LoginsTable on Windows for IE7 password |
65 // access, but for now, we still create it on all platforms since it deletes | 67 // access, but for now, we still create it on all platforms since it deletes |
66 // the old logins table. We can remove this after a while, e.g. in M22 or so. | 68 // the old logins table. We can remove this after a while, e.g. in M22 or so. |
67 web_database_->AddTable( | 69 web_database_->AddTable( |
68 scoped_ptr<WebDatabaseTable>(new LoginsTable())); | 70 scoped_ptr<WebDatabaseTable>(new LoginsTable())); |
69 web_database_->AddTable( | 71 web_database_->AddTable( |
70 scoped_ptr<WebDatabaseTable>(new TokenServiceTable())); | 72 scoped_ptr<WebDatabaseTable>(new TokenServiceTable())); |
71 web_database_->AddTable( | 73 web_database_->AddTable( |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 } | 182 } |
181 | 183 |
182 ProfileKeyedService* | 184 ProfileKeyedService* |
183 WebDataServiceFactory::BuildServiceInstanceFor(Profile* profile) const { | 185 WebDataServiceFactory::BuildServiceInstanceFor(Profile* profile) const { |
184 return new WebDataServiceWrapper(profile); | 186 return new WebDataServiceWrapper(profile); |
185 } | 187 } |
186 | 188 |
187 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const { | 189 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const { |
188 return true; | 190 return true; |
189 } | 191 } |
OLD | NEW |