| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "chrome/browser/webdata/web_data_service.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "chrome/browser/password_manager/ie7_password.h" | 8 #include "chrome/browser/password_manager/ie7_password.h" |
| 9 #include "chrome/browser/webdata/logins_table.h" | 9 #include "chrome/browser/webdata/logins_table.h" |
| 10 #include "chrome/browser/webdata/web_database_service.h" | 10 #include "chrome/browser/webdata/web_database_service.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 WebDataService::Handle WebDataService::GetIE7Login( | 24 WebDataService::Handle WebDataService::GetIE7Login( |
| 25 const IE7PasswordInfo& info, | 25 const IE7PasswordInfo& info, |
| 26 WebDataServiceConsumer* consumer) { | 26 WebDataServiceConsumer* consumer) { |
| 27 return wdbs_->ScheduleDBTaskWithResult( | 27 return wdbs_->ScheduleDBTaskWithResult( |
| 28 FROM_HERE, Bind(&WebDataService::GetIE7LoginImpl, this, info), consumer); | 28 FROM_HERE, Bind(&WebDataService::GetIE7LoginImpl, this, info), consumer); |
| 29 } | 29 } |
| 30 | 30 |
| 31 WebDatabase::State WebDataService::AddIE7LoginImpl( | 31 WebDatabase::State WebDataService::AddIE7LoginImpl( |
| 32 const IE7PasswordInfo& info, WebDatabase* db) { | 32 const IE7PasswordInfo& info, WebDatabase* db) { |
| 33 if (db->GetLoginsTable()->AddIE7Login(info)) | 33 if (LoginsTable::FromWebDatabase(db)->AddIE7Login(info)) |
| 34 return WebDatabase::COMMIT_NEEDED; | 34 return WebDatabase::COMMIT_NEEDED; |
| 35 return WebDatabase::COMMIT_NOT_NEEDED; | 35 return WebDatabase::COMMIT_NOT_NEEDED; |
| 36 } | 36 } |
| 37 | 37 |
| 38 WebDatabase::State WebDataService::RemoveIE7LoginImpl( | 38 WebDatabase::State WebDataService::RemoveIE7LoginImpl( |
| 39 const IE7PasswordInfo& info, WebDatabase* db) { | 39 const IE7PasswordInfo& info, WebDatabase* db) { |
| 40 if (db->GetLoginsTable()->RemoveIE7Login(info)) | 40 if (LoginsTable::FromWebDatabase(db)->RemoveIE7Login(info)) |
| 41 return WebDatabase::COMMIT_NEEDED; | 41 return WebDatabase::COMMIT_NEEDED; |
| 42 return WebDatabase::COMMIT_NOT_NEEDED; | 42 return WebDatabase::COMMIT_NOT_NEEDED; |
| 43 } | 43 } |
| 44 | 44 |
| 45 scoped_ptr<WDTypedResult> WebDataService::GetIE7LoginImpl( | 45 scoped_ptr<WDTypedResult> WebDataService::GetIE7LoginImpl( |
| 46 const IE7PasswordInfo& info, WebDatabase* db) { | 46 const IE7PasswordInfo& info, WebDatabase* db) { |
| 47 IE7PasswordInfo result; | 47 IE7PasswordInfo result; |
| 48 db->GetLoginsTable()->GetIE7Login(info, &result); | 48 LoginsTable::FromWebDatabase(db)->GetIE7Login(info, &result); |
| 49 return scoped_ptr<WDTypedResult>( | 49 return scoped_ptr<WDTypedResult>( |
| 50 new WDResult<IE7PasswordInfo>(PASSWORD_IE7_RESULT, result)); | 50 new WDResult<IE7PasswordInfo>(PASSWORD_IE7_RESULT, result)); |
| 51 } | 51 } |
| OLD | NEW |