| 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/autofill_profile_syncable_service.h" | 5 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" |
| 6 | 6 |
| 7 #include "base/guid.h" | 7 #include "base/guid.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 539 } | 539 } |
| 540 | 540 |
| 541 bool AutofillProfileSyncableService::MergeProfile( | 541 bool AutofillProfileSyncableService::MergeProfile( |
| 542 const AutofillProfile& merge_from, | 542 const AutofillProfile& merge_from, |
| 543 AutofillProfile* merge_into) { | 543 AutofillProfile* merge_into) { |
| 544 merge_into->OverwriteWithOrAddTo(merge_from); | 544 merge_into->OverwriteWithOrAddTo(merge_from); |
| 545 return (merge_into->Compare(merge_from) != 0); | 545 return (merge_into->Compare(merge_from) != 0); |
| 546 } | 546 } |
| 547 | 547 |
| 548 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const { | 548 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const { |
| 549 return web_data_service_->GetDatabase()->GetAutofillTable(); | 549 return AutofillTable::FromWebDatabase(web_data_service_->GetDatabase()); |
| 550 } | 550 } |
| 551 | 551 |
| 552 AutofillProfileSyncableService::DataBundle::DataBundle() {} | 552 AutofillProfileSyncableService::DataBundle::DataBundle() {} |
| 553 | 553 |
| 554 AutofillProfileSyncableService::DataBundle::~DataBundle() { | 554 AutofillProfileSyncableService::DataBundle::~DataBundle() { |
| 555 } | 555 } |
| OLD | NEW |