Chromium Code Reviews| Index: components/autofill/browser/webdata/autofill_webdata_backend.cc |
| diff --git a/components/autofill/browser/webdata/autofill_webdata_backend.cc b/components/autofill/browser/webdata/autofill_webdata_backend.cc |
| index 0cda3d15310d9e4796315c7be1d2442af50caffb..0794f59bc5eb0aaf4abdfe1fd4bb6573c7db8366 100644 |
| --- a/components/autofill/browser/webdata/autofill_webdata_backend.cc |
| +++ b/components/autofill/browser/webdata/autofill_webdata_backend.cc |
| @@ -14,6 +14,7 @@ |
| #include "components/autofill/browser/webdata/autofill_table.h" |
| #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h" |
| #include "components/autofill/common/form_field_data.h" |
| +#include "components/webdata/common/web_data_service_backend.h" |
| using base::Bind; |
| using base::Time; |
| @@ -21,7 +22,11 @@ using content::BrowserThread; |
| namespace autofill { |
| -AutofillWebDataBackend::AutofillWebDataBackend() { |
| +AutofillWebDataBackend::AutofillWebDataBackend( |
| + scoped_refptr<WebDataServiceBackend> web_db_backend, |
| + const base::Closure& on_changed_callback) |
| + : web_database_backend_(web_db_backend), |
| + on_changed_callback_(new base::Closure(on_changed_callback)) { |
| } |
| void AutofillWebDataBackend::AddObserver( |
| @@ -36,7 +41,33 @@ void AutofillWebDataBackend::RemoveObserver( |
| db_observer_list_.RemoveObserver(observer); |
| } |
| -AutofillWebDataBackend::~AutofillWebDataBackend() { |
| +WebDatabase* AutofillWebDataBackend::GetDatabaseOnDB() { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); |
| + if (!web_database_backend_) |
|
Ilya Sherman
2013/05/08 00:39:06
Why is it possible for web_database_backend_ to be
Cait (Slow)
2013/05/08 19:16:01
Done.
|
| + return NULL; |
| + |
| + return web_database_backend_->database(); |
| +} |
| + |
| +void AutofillWebDataBackend::RemoveExpiredFormElementsWrapper() { |
| + if (!web_database_backend_ || !web_database_backend_->database()) |
|
Ilya Sherman
2013/05/08 00:39:06
Why is it possible for web_database_backend_ or we
Cait (Slow)
2013/05/08 19:16:01
Done.
|
| + return; |
| + |
| + if (RemoveExpiredFormElements(web_database_backend_->database()) == |
| + WebDatabase::COMMIT_NEEDED) { |
|
Ilya Sherman
2013/05/08 00:39:06
nit: Indent four more spaces.
Cait (Slow)
2013/05/08 19:16:01
Done.
|
| + web_database_backend_->database()->CommitTransaction(); |
| + web_database_backend_->database()->BeginTransaction(); |
| + } |
| +} |
| + |
| +void AutofillWebDataBackend::NotifyOfMultipleAutofillChanges() { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); |
| + |
| + if (!on_changed_callback_.get()|| on_changed_callback_->is_null()) |
|
Ilya Sherman
2013/05/08 00:39:06
nit: Please add a space before the "||" operator.
Ilya Sherman
2013/05/08 00:39:06
Why is it possible for the callback to be null?
Cait (Slow)
2013/05/08 19:16:01
Done.
|
| + return; |
|
Ilya Sherman
2013/05/08 00:39:06
nit: Please leave a blank line after this one.
Cait (Slow)
2013/05/08 19:16:01
Done.
|
| + BrowserThread::PostTask(BrowserThread::UI, |
| + FROM_HERE, |
| + *(on_changed_callback_.get()); |
|
Ilya Sherman
2013/05/08 00:39:06
This line looks like it's missing a parenthesis...
Cait (Slow)
2013/05/08 19:16:01
Done.
|
| } |
| WebDatabase::State AutofillWebDataBackend::AddFormElements( |
| @@ -295,6 +326,9 @@ WebDatabase::State |
| return WebDatabase::COMMIT_NOT_NEEDED; |
| } |
| +AutofillWebDataBackend::~AutofillWebDataBackend() { |
| +} |
|
Ilya Sherman
2013/05/08 00:39:06
Hrm, why did this get moved down?
Cait (Slow)
2013/05/08 19:16:01
Done.
|
| + |
| void AutofillWebDataBackend::DestroyAutofillProfileResult( |
| const WDTypedResult* result) { |
| DCHECK(result->GetType() == AUTOFILL_PROFILES_RESULT); |