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/logins_table.h" | 5 #include "chrome/browser/webdata/logins_table.h" |
6 #include "chrome/browser/webdata/web_data_service.h" | 6 #include "chrome/browser/webdata/web_data_service.h" |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "chrome/browser/password_manager/ie7_password.h" | 9 #include "chrome/browser/password_manager/ie7_password.h" |
10 #include "chrome/browser/webdata/web_database.h" | 10 #include "chrome/browser/webdata/web_database.h" |
11 | 11 |
12 using base::Bind; | 12 using base::Bind; |
13 | 13 |
14 void WebDataService::AddIE7Login(const IE7PasswordInfo& info) { | 14 void WebDataService::AddIE7Login(const IE7PasswordInfo& info) { |
15 GenericRequest<IE7PasswordInfo>* request = | 15 GenericRequest<IE7PasswordInfo>* request = |
16 new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(), NULL, | 16 new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(), NULL, |
17 info); | 17 info); |
18 RegisterRequest(request); | 18 RegisterRequest(request); |
19 ScheduleTask(Bind(&WebDataService::AddIE7LoginImpl, this, request)); | 19 ScheduleTask(FROM_HERE, |
| 20 Bind(&WebDataService::AddIE7LoginImpl, this, request)); |
20 } | 21 } |
21 | 22 |
22 void WebDataService::RemoveIE7Login(const IE7PasswordInfo& info) { | 23 void WebDataService::RemoveIE7Login(const IE7PasswordInfo& info) { |
23 GenericRequest<IE7PasswordInfo>* request = | 24 GenericRequest<IE7PasswordInfo>* request = |
24 new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(), NULL, | 25 new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(), NULL, |
25 info); | 26 info); |
26 RegisterRequest(request); | 27 RegisterRequest(request); |
27 ScheduleTask(Bind(&WebDataService::RemoveIE7LoginImpl, this, request)); | 28 ScheduleTask(FROM_HERE, |
| 29 Bind(&WebDataService::RemoveIE7LoginImpl, this, request)); |
28 } | 30 } |
29 | 31 |
30 WebDataService::Handle WebDataService::GetIE7Login( | 32 WebDataService::Handle WebDataService::GetIE7Login( |
31 const IE7PasswordInfo& info, | 33 const IE7PasswordInfo& info, |
32 WebDataServiceConsumer* consumer) { | 34 WebDataServiceConsumer* consumer) { |
33 GenericRequest<IE7PasswordInfo>* request = | 35 GenericRequest<IE7PasswordInfo>* request = |
34 new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(), | 36 new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(), |
35 consumer, info); | 37 consumer, info); |
36 RegisterRequest(request); | 38 RegisterRequest(request); |
37 ScheduleTask(Bind(&WebDataService::GetIE7LoginImpl, this, request)); | 39 ScheduleTask(FROM_HERE, |
| 40 Bind(&WebDataService::GetIE7LoginImpl, this, request)); |
38 return request->GetHandle(); | 41 return request->GetHandle(); |
39 } | 42 } |
40 | 43 |
41 void WebDataService::AddIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request) { | 44 void WebDataService::AddIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request) { |
42 if (db_ && !request->IsCancelled(NULL)) { | 45 if (db_ && !request->IsCancelled(NULL)) { |
43 if (db_->GetLoginsTable()->AddIE7Login(request->arg())) | 46 if (db_->GetLoginsTable()->AddIE7Login(request->arg())) |
44 ScheduleCommit(); | 47 ScheduleCommit(); |
45 } | 48 } |
46 request->RequestComplete(); | 49 request->RequestComplete(); |
47 } | 50 } |
(...skipping 10 matching lines...) Expand all Loading... |
58 void WebDataService::GetIE7LoginImpl( | 61 void WebDataService::GetIE7LoginImpl( |
59 GenericRequest<IE7PasswordInfo>* request) { | 62 GenericRequest<IE7PasswordInfo>* request) { |
60 if (db_ && !request->IsCancelled(NULL)) { | 63 if (db_ && !request->IsCancelled(NULL)) { |
61 IE7PasswordInfo result; | 64 IE7PasswordInfo result; |
62 db_->GetLoginsTable()->GetIE7Login(request->arg(), &result); | 65 db_->GetLoginsTable()->GetIE7Login(request->arg(), &result); |
63 request->SetResult( | 66 request->SetResult( |
64 new WDResult<IE7PasswordInfo>(PASSWORD_IE7_RESULT, result)); | 67 new WDResult<IE7PasswordInfo>(PASSWORD_IE7_RESULT, result)); |
65 } | 68 } |
66 request->RequestComplete(); | 69 request->RequestComplete(); |
67 } | 70 } |
OLD | NEW |