| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/autofill/address_field.h" | 5 #include "chrome/browser/autofill/address_field.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" |
| 9 #include "base/string16.h" | 9 #include "base/string16.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 ok = ok && Add(field_type_map, state_, AutoFillType(address_state)); | 63 ok = ok && Add(field_type_map, state_, AutoFillType(address_state)); |
| 64 DCHECK(ok); | 64 DCHECK(ok); |
| 65 ok = ok && Add(field_type_map, zip_, AutoFillType(address_zip)); | 65 ok = ok && Add(field_type_map, zip_, AutoFillType(address_zip)); |
| 66 DCHECK(ok); | 66 DCHECK(ok); |
| 67 ok = ok && Add(field_type_map, country_, AutoFillType(address_country)); | 67 ok = ok && Add(field_type_map, country_, AutoFillType(address_country)); |
| 68 DCHECK(ok); | 68 DCHECK(ok); |
| 69 | 69 |
| 70 return ok; | 70 return ok; |
| 71 } | 71 } |
| 72 | 72 |
| 73 FormFieldType AddressField::GetFormFieldType() const { |
| 74 return kAddressType; |
| 75 } |
| 76 |
| 73 AddressField* AddressField::Parse( | 77 AddressField* AddressField::Parse( |
| 74 std::vector<AutoFillField*>::const_iterator* iter, | 78 std::vector<AutoFillField*>::const_iterator* iter, |
| 75 bool is_ecml) { | 79 bool is_ecml) { |
| 76 DCHECK(iter); | 80 DCHECK(iter); |
| 77 if (!iter) | 81 if (!iter) |
| 78 return NULL; | 82 return NULL; |
| 79 | 83 |
| 80 scoped_ptr<AddressField> address_field(new AddressField); | 84 scoped_ptr<AddressField> address_field(new AddressField); |
| 81 std::vector<AutoFillField*>::const_iterator q = *iter; | 85 std::vector<AutoFillField*>::const_iterator q = *iter; |
| 82 string16 pattern; | 86 string16 pattern; |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 return kBillingAddress; | 382 return kBillingAddress; |
| 379 | 383 |
| 380 if (bill == string16::npos && ship != string16::npos) | 384 if (bill == string16::npos && ship != string16::npos) |
| 381 return kShippingAddress; | 385 return kShippingAddress; |
| 382 | 386 |
| 383 if (bill > ship) | 387 if (bill > ship) |
| 384 return kBillingAddress; | 388 return kBillingAddress; |
| 385 | 389 |
| 386 return kShippingAddress; | 390 return kShippingAddress; |
| 387 } | 391 } |
| OLD | NEW |