diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-27 12:10:57 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-30 13:29:14 +0100 |
| commit | 48b27ac202354d545b08f8a459fe808616f12c4f (patch) | |
| tree | 5f6f0353930d4f0fec5617e2a7042ca7b801bc59 /chrome | |
| parent | df8681736ba20032c392b1e112a93ac7e5fe0335 (diff) | |
| download | external_chromium-48b27ac202354d545b08f8a459fe808616f12c4f.zip external_chromium-48b27ac202354d545b08f8a459fe808616f12c4f.tar.gz external_chromium-48b27ac202354d545b08f8a459fe808616f12c4f.tar.bz2 | |
Merge Chromium at r11.0.696.0: Compile fixes in autofill_country.cc
Leaving some issues open as they need a jni implementation. Tracked
by http://b/issue?id=4959752
Change-Id: Id413fd203aeb3ba8b33f9f11140bab620ddc7f0e
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autofill/autofill_country.cc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc index 7cc8a45..6ffbfcd 100644 --- a/chrome/browser/autofill/autofill_country.cc +++ b/chrome/browser/autofill/autofill_country.cc @@ -11,9 +11,13 @@ #include "base/singleton.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#ifndef ANDROID #include "chrome/browser/browser_process.h" +#endif #include "grit/generated_resources.h" +#ifndef ANDROID #include "ui/base/l10n/l10n_util_collator.h" +#endif #include "ui/base/l10n/l10n_util.h" #include "unicode/coll.h" #include "unicode/locid.h" @@ -431,10 +435,14 @@ const std::string AutofillCountry::GetCountryCode( icu::Locale(NULL, country_code.c_str()).getISO3Country(); string16 name = GetDisplayName(country_code, icu_locale); - if (country == UTF8ToUTF16(iso3_country_code) || - l10n_util::CompareString16WithCollator(collator.get(), - country, - name) == UCOL_EQUAL) { + if (country == UTF8ToUTF16(iso3_country_code) +#ifndef ANDROID + // TODO(kristianm): Fix this in Android: http://b/issue?id=4959752 + || l10n_util::CompareString16WithCollator(collator.get(), + country, + name) == UCOL_EQUAL +#endif + ) { return country_code; } } @@ -448,7 +456,12 @@ const std::string AutofillCountry::GetCountryCode( // static const std::string AutofillCountry::ApplicationLocale() { +#ifdef ANDROID + // TODO(kristianm): Fix this in Android: http://b/issue?id=4959752 + return ""; +#else return g_browser_process->GetApplicationLocale(); +#endif } AutofillCountry::AutofillCountry(const std::string& country_code, |