OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/autofill/core/browser/phone_field.h" | 5 #include "components/autofill/core/browser/phone_field.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| 11 #include "base/strings/utf_string_conversions.h" |
11 #include "components/autofill/core/browser/autofill_field.h" | 12 #include "components/autofill/core/browser/autofill_field.h" |
12 #include "components/autofill/core/browser/autofill_regex_constants.h" | 13 #include "components/autofill/core/browser/autofill_regex_constants.h" |
13 #include "components/autofill/core/browser/autofill_scanner.h" | 14 #include "components/autofill/core/browser/autofill_scanner.h" |
14 | 15 |
15 namespace autofill { | 16 namespace autofill { |
16 namespace { | 17 namespace { |
17 | 18 |
18 // This string includes all area code separators, including NoText. | 19 // This string includes all area code separators, including NoText. |
19 std::string GetAreaRegex() { | 20 std::string GetAreaRegex() { |
20 std::string area_code = kAreaCodeRe; | 21 std::string area_code = kAreaCodeRe; |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 NOTREACHED(); | 269 NOTREACHED(); |
269 break; | 270 break; |
270 } | 271 } |
271 return std::string(); | 272 return std::string(); |
272 } | 273 } |
273 | 274 |
274 // static | 275 // static |
275 bool PhoneField::ParsePhoneField(AutofillScanner* scanner, | 276 bool PhoneField::ParsePhoneField(AutofillScanner* scanner, |
276 const std::string& regex, | 277 const std::string& regex, |
277 AutofillField** field) { | 278 AutofillField** field) { |
278 return ParseFieldSpecifics( | 279 return ParseFieldSpecifics(scanner, |
279 scanner, regex, MATCH_DEFAULT | MATCH_TELEPHONE | MATCH_NUMBER, field); | 280 base::UTF8ToUTF16(regex), |
| 281 MATCH_DEFAULT | MATCH_TELEPHONE | MATCH_NUMBER, |
| 282 field); |
280 } | 283 } |
281 | 284 |
282 } // namespace autofill | 285 } // namespace autofill |
OLD | NEW |