Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(785)

Unified Diff: ui/base/l10n/l10n_util.cc

Issue 628263004: [Android] Simplify logic for grabbing initial country-code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java ('k') | ui/base/l10n/l10n_util_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/l10n/l10n_util.cc
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc
index 9db2206fae2daa4093facbfa6132ad4285264e5b..bcc070af8d18042bb9a86e12d8332c22ec1e7245 100644
--- a/ui/base/l10n/l10n_util.cc
+++ b/ui/base/l10n/l10n_util.cc
@@ -33,6 +33,7 @@
#include "ui/base/ui_base_paths.h"
#if defined(OS_ANDROID)
+#include "base/android/locale_utils.h"
#include "ui/base/l10n/l10n_util_android.h"
#endif
@@ -447,7 +448,7 @@ std::string GetApplicationLocaleInternal(const std::string& pref_locale) {
#elif defined(OS_ANDROID)
// On Android, query java.util.Locale for the default locale.
- candidates.push_back(GetDefaultLocale());
+ candidates.push_back(base::android::GetDefaultLocale());
#elif defined(USE_GLIB) && !defined(OS_CHROMEOS)
« no previous file with comments | « ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java ('k') | ui/base/l10n/l10n_util_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698