Use GetDefaultLocaleListString for returning LocaleList

android_webview/native/aw_contents.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_contents.h"
 
 #include <limits>
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 89 matching lines @@
 namespace android_webview {
 
 namespace {
 
 bool g_should_download_favicons = false;
 
 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 {
  public:
   explicit AwContentsUserData(AwContents* ptr) : contents_(ptr) {}
 
   static AwContents* GetContents(WebContents* web_contents) {
     if (!web_contents)
       return NULL;
     AwContentsUserData* data = static_cast<AwContentsUserData*>(
@@ skipping 20 matching lines @@
   content::RenderViewHost* rvh =
       content::RenderViewHost::FromID(render_process_id, render_view_id);
   if (!rvh) return NULL;
   content::WebContents* web_contents =
       content::WebContents::FromRenderViewHost(rvh);
   if (!web_contents) return NULL;
   return FromWebContents(web_contents);
 }
 
 // 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
 std::string AwContents::GetLocale() {
   return g_locale;
 }
 
 // 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(
       content::WebContents::FromRenderFrameHost(
           content::RenderFrameHost::FromID(render_process_id,
                                            render_frame_id)));
   return aw_contents;
 }
 
 AwContents::AwContents(std::unique_ptr<WebContents> web_contents)
@@ skipping 1089 matching lines @@
   int routing_id = new_host->GetRoutingID();
   // At this point, the current RVH may or may not contain a compositor. So
   // compositor_ may be nullptr, in which case
   // BrowserViewRenderer::DidInitializeCompositor() callback is time when the
   // new compositor is constructed.
   browser_view_renderer_.SetActiveCompositorID(
       CompositorID(process_id, routing_id));
 }
 
 }  // namespace android_webview