| 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/sync/glue/autofill_model_associator.h" | 5 #include "chrome/browser/sync/glue/autofill_model_associator.h" |
| 6 | 6 |
| 7 #include <functional> | 7 #include <functional> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 diff = MergeField(p, NAME_LAST, s.name_last()) || diff; | 499 diff = MergeField(p, NAME_LAST, s.name_last()) || diff; |
| 500 diff = MergeField(p, NAME_MIDDLE, s.name_middle()) || diff; | 500 diff = MergeField(p, NAME_MIDDLE, s.name_middle()) || diff; |
| 501 diff = MergeField(p, ADDRESS_HOME_LINE1, s.address_home_line1()) || diff; | 501 diff = MergeField(p, ADDRESS_HOME_LINE1, s.address_home_line1()) || diff; |
| 502 diff = MergeField(p, ADDRESS_HOME_LINE2, s.address_home_line2()) || diff; | 502 diff = MergeField(p, ADDRESS_HOME_LINE2, s.address_home_line2()) || diff; |
| 503 diff = MergeField(p, ADDRESS_HOME_CITY, s.address_home_city()) || diff; | 503 diff = MergeField(p, ADDRESS_HOME_CITY, s.address_home_city()) || diff; |
| 504 diff = MergeField(p, ADDRESS_HOME_STATE, s.address_home_state()) || diff; | 504 diff = MergeField(p, ADDRESS_HOME_STATE, s.address_home_state()) || diff; |
| 505 diff = MergeField(p, ADDRESS_HOME_COUNTRY, s.address_home_country()) || diff; | 505 diff = MergeField(p, ADDRESS_HOME_COUNTRY, s.address_home_country()) || diff; |
| 506 diff = MergeField(p, ADDRESS_HOME_ZIP, s.address_home_zip()) || diff; | 506 diff = MergeField(p, ADDRESS_HOME_ZIP, s.address_home_zip()) || diff; |
| 507 diff = MergeField(p, EMAIL_ADDRESS, s.email_address()) || diff; | 507 diff = MergeField(p, EMAIL_ADDRESS, s.email_address()) || diff; |
| 508 diff = MergeField(p, COMPANY_NAME, s.company_name()) || diff; | 508 diff = MergeField(p, COMPANY_NAME, s.company_name()) || diff; |
| 509 diff = MergeField(p, PHONE_FAX_WHOLE_NUMBER, s.phone_fax_whole_number()) | |
| 510 || diff; | |
| 511 diff = MergeField(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number()) | 509 diff = MergeField(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number()) |
| 512 || diff; | 510 || diff; |
| 513 return diff; | 511 return diff; |
| 514 } | 512 } |
| 515 | 513 |
| 516 bool AutofillModelAssociator::CryptoReadyIfNecessary() { | 514 bool AutofillModelAssociator::CryptoReadyIfNecessary() { |
| 517 // We only access the cryptographer while holding a transaction. | 515 // We only access the cryptographer while holding a transaction. |
| 518 sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare()); | 516 sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare()); |
| 519 syncable::ModelTypeSet encrypted_types; | 517 syncable::ModelTypeSet encrypted_types; |
| 520 encrypted_types = sync_api::GetEncryptedTypes(&trans); | 518 encrypted_types = sync_api::GetEncryptedTypes(&trans); |
| 521 return encrypted_types.count(syncable::AUTOFILL) == 0 || | 519 return encrypted_types.count(syncable::AUTOFILL) == 0 || |
| 522 sync_service_->IsCryptographerReady(&trans); | 520 sync_service_->IsCryptographerReady(&trans); |
| 523 } | 521 } |
| 524 | 522 |
| 525 } // namespace browser_sync | 523 } // namespace browser_sync |
| OLD | NEW |