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

Unified Diff: android_webview/browser/aw_content_browser_client.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
Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 6c0d6f503eb95fc15aec6cb2135670944d0b3972..02029c3300c9603966d9266fc3009a98e8356aa3 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -19,6 +19,7 @@
#include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
#include "android_webview/common/render_view_messages.h"
#include "android_webview/common/url_constants.h"
+#include "base/android/locale_utils.h"
#include "base/base_paths_android.h"
#include "base/path_service.h"
#include "components/cdm/browser/cdm_message_filter_android.h"
@@ -34,7 +35,6 @@
#include "net/android/network_library.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/ssl/ssl_info.h"
-#include "ui/base/l10n/l10n_util_android.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/resources/grit/ui_resources.h"
@@ -155,7 +155,7 @@ void CancelProtectedMediaIdentifierPermissionRequests(
std::string AwContentBrowserClient::GetAcceptLangsImpl() {
// Start with the currnet locale.
- std::string langs = l10n_util::GetDefaultLocale();
+ std::string langs = base::android::GetDefaultLocale();
// If we're not en-US, add in en-US which will be
// used with a lower q-value.
@@ -259,7 +259,7 @@ void AwContentBrowserClient::AppendExtraCommandLineSwitches(
}
std::string AwContentBrowserClient::GetApplicationLocale() {
- return l10n_util::GetDefaultLocale();
+ return base::android::GetDefaultLocale();
}
std::string AwContentBrowserClient::GetAcceptLangs(
« no previous file with comments | « android_webview/browser/aw_browser_main_parts.cc ('k') | android_webview/browser/aw_form_database_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698