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

Unified Diff: android_webview/native/aw_contents.cc

Issue 2496183002: Use GetDefaultLocaleListString for returning LocaleList (Closed)
Patch Set: change locales to localelist in AWContents.java Created 4 years, 1 month 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 | « android_webview/native/aw_contents.h ('k') | android_webview/native/aw_locale_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index a8dfed93d68ffff0ee31dfe25a47d422ea1b0091..688d55ef4aec276daeac73b92f9f33fdab4c2002 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -107,6 +107,8 @@ bool g_force_auxiliary_bitmap_rendering = false;
std::string g_locale;
+std::string g_locale_list;
+
const void* kAwContentsUserDataKey = &kAwContentsUserDataKey;
class AwContentsUserData : public base::SupportsUserData::Data {
@@ -147,10 +149,12 @@ AwContents* AwContents::FromID(int render_process_id, int render_view_id) {
}
// static
-void SetLocale(JNIEnv* env,
- const JavaParamRef<jclass>&,
- const JavaParamRef<jstring>& locale) {
+void UpdateDefaultLocale(JNIEnv* env,
+ const JavaParamRef<jclass>&,
+ const JavaParamRef<jstring>& locale,
+ const JavaParamRef<jstring>& locale_list) {
g_locale = ConvertJavaStringToUTF8(env, locale);
+ g_locale_list = ConvertJavaStringToUTF8(env, locale_list);
}
// static
@@ -159,6 +163,11 @@ std::string AwContents::GetLocale() {
}
// static
+std::string AwContents::GetLocaleList() {
+ return g_locale_list;
+}
+
+// static
AwBrowserPermissionRequestDelegate* AwBrowserPermissionRequestDelegate::FromID(
int render_process_id, int render_frame_id) {
AwContents* aw_contents = AwContents::FromWebContents(
« no previous file with comments | « android_webview/native/aw_contents.h ('k') | android_webview/native/aw_locale_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698