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 87a1b932882e6235414e619b61b32cd11766cb2e..ff2ee789cbbe4c27060814ddfc0d4aa65b7d8fc7 100644 |
--- a/android_webview/browser/aw_content_browser_client.cc |
+++ b/android_webview/browser/aw_content_browser_client.cc |
@@ -9,6 +9,7 @@ |
#include "android_webview/browser/aw_contents_client_bridge_base.h" |
#include "android_webview/browser/aw_contents_io_thread_client.h" |
#include "android_webview/browser/aw_cookie_access_policy.h" |
+#include "android_webview/browser/aw_locale_manager.h" |
#include "android_webview/browser/aw_printing_message_filter.h" |
#include "android_webview/browser/aw_quota_permission_context.h" |
#include "android_webview/browser/aw_web_preferences_populater.h" |
@@ -106,11 +107,14 @@ class AwAccessTokenStore : public content::AccessTokenStore { |
DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore); |
}; |
+AwLocaleManager* g_locale_manager = NULL; |
+ |
} // anonymous namespace |
+// static |
std::string AwContentBrowserClient::GetAcceptLangsImpl() { |
- // Start with the currnet locale. |
- std::string langs = base::android::GetDefaultLocale(); |
+ // Start with the current locale. |
+ std::string langs = g_locale_manager->GetLocale(); |
// If we're not en-US, add in en-US which will be |
// used with a lower q-value. |
@@ -120,6 +124,7 @@ std::string AwContentBrowserClient::GetAcceptLangsImpl() { |
return langs; |
} |
+// static |
AwBrowserContext* AwContentBrowserClient::GetAwBrowserContext() { |
return AwBrowserContext::GetDefault(); |
} |
@@ -133,9 +138,12 @@ AwContentBrowserClient::AwContentBrowserClient( |
} |
browser_context_.reset( |
new AwBrowserContext(user_data_dir, native_factory_)); |
+ g_locale_manager = native_factory->CreateAwLocaleManager(); |
} |
AwContentBrowserClient::~AwContentBrowserClient() { |
+ delete g_locale_manager; |
+ g_locale_manager = NULL; |
} |
void AwContentBrowserClient::AddCertificate(net::CertificateMimeType cert_type, |