diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-25 13:32:08 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 7375b0cf763978c2988cd0784818fbedd11ce85a (patch) | |
| tree | 359aaf3fbb38d1062cfee7972d73b1c9a4f228fa /chrome | |
| parent | 3f50c38dc070f4bb515c1b64450dae14f316474e (diff) | |
| download | external_chromium-7375b0cf763978c2988cd0784818fbedd11ce85a.zip external_chromium-7375b0cf763978c2988cd0784818fbedd11ce85a.tar.gz external_chromium-7375b0cf763978c2988cd0784818fbedd11ce85a.tar.bz2 | |
Merge Chromium at 10.0.634.0: Fix conflicts in autofill
Catching up with our autofill cherry-picks:
http://codereview.chromium.org/6026010
A new constant IDS_AUTOFILL_FAX_RE was introduced:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710
Change-Id: I5db292e315044aa9a72de5caf39350e654aa1626
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autofill/address_field.cc | 15 | ||||
| -rw-r--r-- | chrome/browser/autofill/credit_card_field.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/autofill/form_field.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/autofill/name_field.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/autofill/phone_field.cc | 6 |
5 files changed, 0 insertions, 39 deletions
diff --git a/chrome/browser/autofill/address_field.cc b/chrome/browser/autofill/address_field.cc index ae4abaa..b2bef04 100644 --- a/chrome/browser/autofill/address_field.cc +++ b/chrome/browser/autofill/address_field.cc @@ -4,13 +4,7 @@ #include "chrome/browser/autofill/address_field.h" -<<<<<<< HEAD -#ifdef ANDROID #include "app/l10n_util.h" -#endif -======= -#include "app/l10n_util.h" ->>>>>>> chromium.org at r10.0.634.0 #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -215,11 +209,7 @@ bool AddressField::ParseAddressLines( if (!ParseText(iter, pattern, &address_field->address1_)) return false; } else { -<<<<<<< HEAD - string16 pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_LINE_1_RE); -======= pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_LINE_1_RE); ->>>>>>> chromium.org at r10.0.634.0 string16 label_pattern = l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_LINE_1_LABEL_RE); @@ -329,13 +319,8 @@ bool AddressField::ParseZipCode( // Look for a zip+4, whose field name will also often contain // the substring "zip". ParseText(iter, -<<<<<<< HEAD - l10n_util::GetStringUTF16(IDS_AUTOFILL_ZIP_4_RE), - &address_field->zip4_); -======= l10n_util::GetStringUTF16(IDS_AUTOFILL_ZIP_4_RE), &address_field->zip4_); ->>>>>>> chromium.org at r10.0.634.0 } return true; diff --git a/chrome/browser/autofill/credit_card_field.cc b/chrome/browser/autofill/credit_card_field.cc index 6cbe986..3a51b6f 100644 --- a/chrome/browser/autofill/credit_card_field.cc +++ b/chrome/browser/autofill/credit_card_field.cc @@ -4,13 +4,7 @@ #include "chrome/browser/autofill/credit_card_field.h" -<<<<<<< HEAD -#ifdef ANDROID #include "app/l10n_util.h" -#endif -======= -#include "app/l10n_util.h" ->>>>>>> chromium.org at r10.0.634.0 #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/autofill/form_field.cc b/chrome/browser/autofill/form_field.cc index 902d2d8..545ce1b 100644 --- a/chrome/browser/autofill/form_field.cc +++ b/chrome/browser/autofill/form_field.cc @@ -4,13 +4,7 @@ #include "chrome/browser/autofill/form_field.h" -<<<<<<< HEAD -#ifdef ANDROID #include "app/l10n_util.h" -#endif -======= -#include "app/l10n_util.h" ->>>>>>> chromium.org at r10.0.634.0 #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/address_field.h" diff --git a/chrome/browser/autofill/name_field.cc b/chrome/browser/autofill/name_field.cc index 1a5f4c3..8a83ff7 100644 --- a/chrome/browser/autofill/name_field.cc +++ b/chrome/browser/autofill/name_field.cc @@ -4,13 +4,7 @@ #include "chrome/browser/autofill/name_field.h" -<<<<<<< HEAD -#ifdef ANDROID #include "app/l10n_util.h" -#endif -======= -#include "app/l10n_util.h" ->>>>>>> chromium.org at r10.0.634.0 #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" diff --git a/chrome/browser/autofill/phone_field.cc b/chrome/browser/autofill/phone_field.cc index 61ce7bb..083a8dc 100644 --- a/chrome/browser/autofill/phone_field.cc +++ b/chrome/browser/autofill/phone_field.cc @@ -4,13 +4,7 @@ #include "chrome/browser/autofill/phone_field.h" -<<<<<<< HEAD -#ifdef ANDROID #include "app/l10n_util.h" -#endif -======= -#include "app/l10n_util.h" ->>>>>>> chromium.org at r10.0.634.0 #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string16.h" |