| 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/autofill/autofill_profile.h" |    5 #include "chrome/browser/autofill/autofill_profile.h" | 
|    6  |    6  | 
|    7 #include <algorithm> |    7 #include <algorithm> | 
|    8 #include <functional> |    8 #include <functional> | 
|    9 #include <map> |    9 #include <map> | 
|   10 #include <ostream> |   10 #include <ostream> | 
|   11 #include <set> |   11 #include <set> | 
|   12  |   12  | 
|   13 #include "base/basictypes.h" |   13 #include "base/basictypes.h" | 
|   14 #include "base/guid.h" |   14 #include "base/guid.h" | 
|   15 #include "base/logging.h" |   15 #include "base/logging.h" | 
|   16 #include "base/string_util.h" |   16 #include "base/string_util.h" | 
|   17 #include "base/utf_string_conversions.h" |   17 #include "base/utf_string_conversions.h" | 
|   18 #include "chrome/browser/autofill/address.h" |   18 #include "chrome/browser/autofill/address.h" | 
|   19 #include "chrome/browser/autofill/autofill_country.h" |   19 #include "chrome/browser/autofill/autofill_country.h" | 
|   20 #include "chrome/browser/autofill/autofill_field.h" |   20 #include "chrome/browser/autofill/autofill_field.h" | 
|   21 #include "chrome/browser/autofill/autofill_type.h" |   21 #include "chrome/browser/autofill/autofill_type.h" | 
|   22 #include "chrome/browser/autofill/contact_info.h" |   22 #include "chrome/browser/autofill/contact_info.h" | 
|   23 #include "chrome/browser/autofill/phone_number.h" |   23 #include "chrome/browser/autofill/phone_number.h" | 
|   24 #include "chrome/browser/autofill/phone_number_i18n.h" |   24 #include "chrome/browser/autofill/phone_number_i18n.h" | 
|   25 #include "chrome/common/form_field_data.h" |   25 #include "components/autofill/common/form_field_data.h" | 
|   26 #include "grit/generated_resources.h" |   26 #include "grit/generated_resources.h" | 
|   27 #include "ui/base/l10n/l10n_util.h" |   27 #include "ui/base/l10n/l10n_util.h" | 
|   28  |   28  | 
|   29 namespace { |   29 namespace { | 
|   30  |   30  | 
|   31 // Like |AutofillType::GetEquivalentFieldType()|, but also returns |NAME_FULL| |   31 // Like |AutofillType::GetEquivalentFieldType()|, but also returns |NAME_FULL| | 
|   32 // for first, middle, and last name field types. |   32 // for first, middle, and last name field types. | 
|   33 AutofillFieldType GetEquivalentFieldTypeCollapsingNames( |   33 AutofillFieldType GetEquivalentFieldTypeCollapsingNames( | 
|   34     AutofillFieldType field_type) { |   34     AutofillFieldType field_type) { | 
|   35   if (field_type == NAME_FIRST || field_type == NAME_MIDDLE || |   35   if (field_type == NAME_FIRST || field_type == NAME_MIDDLE || | 
| (...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  839       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY)) |  839       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY)) | 
|  840       << " " |  840       << " " | 
|  841       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE)) |  841       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE)) | 
|  842       << " " |  842       << " " | 
|  843       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP)) |  843       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP)) | 
|  844       << " " |  844       << " " | 
|  845       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) |  845       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY)) | 
|  846       << " " |  846       << " " | 
|  847       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER)); |  847       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER)); | 
|  848 } |  848 } | 
| OLD | NEW |