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 /android | |
| 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 'android')
| -rw-r--r-- | android/app/l10n_util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android/app/l10n_util.h b/android/app/l10n_util.h index 52b7e51..2270bf6 100644 --- a/android/app/l10n_util.h +++ b/android/app/l10n_util.h @@ -70,9 +70,10 @@ #define IDS_AUTOFILL_EXPIRATION_MONTH_RE 37 #define IDS_AUTOFILL_EXPIRATION_DATE_RE 38 #define IDS_AUTOFILL_CARD_IGNORED_RE 39 +#define IDS_AUTOFILL_FAX_RE 40 // Don't forget to update the count if you add a new message ID! // (And also update frameworks/base/core/java/android/webkit/L10nUtils.java) -#define ANDROID_L10N_IDS_MESSAGE_COUNT 40 +#define ANDROID_L10N_IDS_MESSAGE_COUNT 41 namespace l10n_util { string16 GetStringUTF16(int message_id); |