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/ui/autofill/data_model_wrapper.h" | 5 #include "chrome/browser/ui/autofill/data_model_wrapper.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 const AutofillType& type) const { | 130 const AutofillType& type) const { |
131 // We display the "raw" phone number which contains user-defined formatting. | 131 // We display the "raw" phone number which contains user-defined formatting. |
132 if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER) { | 132 if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER) { |
133 std::vector<base::string16> values; | 133 std::vector<base::string16> values; |
134 profile_->GetRawMultiInfo(type.GetStorableType(), &values); | 134 profile_->GetRawMultiInfo(type.GetStorableType(), &values); |
135 const base::string16& phone_number = values[GetVariantForType(type)]; | 135 const base::string16& phone_number = values[GetVariantForType(type)]; |
136 | 136 |
137 // If there is no user-defined formatting at all, add some standard | 137 // If there is no user-defined formatting at all, add some standard |
138 // formatting. | 138 // formatting. |
139 if (base::ContainsOnlyChars(phone_number, | 139 if (base::ContainsOnlyChars(phone_number, |
140 base::ASCIIToUTF16("0123456789"))) { | 140 base::ASCIIToUTF16("+0123456789"))) { |
141 std::string region = base::UTF16ToASCII( | 141 std::string region = base::UTF16ToASCII( |
142 GetInfo(AutofillType(HTML_TYPE_COUNTRY_CODE, HTML_MODE_NONE))); | 142 GetInfo(AutofillType(HTML_TYPE_COUNTRY_CODE, HTML_MODE_NONE))); |
143 i18n::PhoneObject phone(phone_number, region); | 143 i18n::PhoneObject phone(phone_number, region); |
144 base::string16 formatted_number = phone.GetFormattedNumber(); | 144 base::string16 formatted_number = phone.GetFormattedNumber(); |
145 // Formatting may fail. | 145 // Formatting may fail. |
146 if (!formatted_number.empty()) | 146 if (!formatted_number.empty()) |
147 return formatted_number; | 147 return formatted_number; |
148 } | 148 } |
149 | 149 |
150 return phone_number; | 150 return phone_number; |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 } | 393 } |
394 | 394 |
395 return base::UTF8ToUTF16(address_->GetFieldValue(field)); | 395 return base::UTF8ToUTF16(address_->GetFieldValue(field)); |
396 } | 396 } |
397 | 397 |
398 const std::string& I18nAddressDataWrapper::GetLanguageCode() const { | 398 const std::string& I18nAddressDataWrapper::GetLanguageCode() const { |
399 return address_->language_code; | 399 return address_->language_code; |
400 } | 400 } |
401 | 401 |
402 } // namespace autofill | 402 } // namespace autofill |
OLD | NEW |