diff options
| author | Ben Murdoch <benm@google.com> | 2011-07-08 16:16:05 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-07-12 13:36:08 +0100 |
| commit | 9276c04a9dd0d2f120860cb824a02493aad163fd (patch) | |
| tree | e3ed8f4c5bcf7837b749284cf32c7326782f9baf /chrome | |
| parent | f5c07d8b70230b234ff8baa3ca2393fc1d5b1091 (diff) | |
| download | external_chromium-9276c04a9dd0d2f120860cb824a02493aad163fd.zip external_chromium-9276c04a9dd0d2f120860cb824a02493aad163fd.tar.gz external_chromium-9276c04a9dd0d2f120860cb824a02493aad163fd.tar.bz2 | |
Return en-US rather than empty string for current locale.
The current locale is expected to be non-empty. Until we hook up
JNI to determine the correct current locale, default to en-US.
Bug: 4959752
Change-Id: I7a9cdcd743fad002818956dc2d6dd3b8003b4297
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autofill/autofill_country.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc index 161175a..eafcee5 100644 --- a/chrome/browser/autofill/autofill_country.cc +++ b/chrome/browser/autofill/autofill_country.cc @@ -628,7 +628,8 @@ const std::string AutofillCountry::GetCountryCode(const string16& country, const std::string AutofillCountry::ApplicationLocale() { #ifdef ANDROID // TODO(kristianm): Fix this in Android: http://b/issue?id=4959752 - return ""; + // For now, default to en-US on Android. + return "en-US"; #else return g_browser_process->GetApplicationLocale(); #endif |