Use LanguageCodeWithDialects instead of LanguageCode to get 'zh-CN' ...

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 3152 matching lines @@
   int num_languages = 0;
   bool is_reliable = false;
   string16 input = WideToUTF16(text);
   Language cld_language =
       DetectLanguageOfUnicodeText(NULL, input.c_str(), true, &is_reliable,
                                   &num_languages, NULL);
   if (cld_language != NUM_LANGUAGES && cld_language != UNKNOWN_LANGUAGE &&
       cld_language != TG_UNKNOWN_LANGUAGE) {
     // We should not use LanguageCode_ISO_639_1 because it does not cover all
     // the languages CLD can detect. As a result, it'll return the invalid
-    // language code for tradtional Chinese among others. |LanguageCode| will go
-    // through ISO 639-1, ISO-639-2 and 'other' tables to do the 'right' thing.
-    language = LanguageCode(cld_language);
+    // language code for tradtional Chinese among others.
+    // |LanguageCodeWithDialect| will go through ISO 639-1, ISO-639-2 and
+    // 'other' tables to do the 'right' thing. In addition, it'll return zh-CN
+    // for Simplified Chinese.
+    language = LanguageCodeWithDialects(cld_language);
   }
   return language;
 }
 
 bool RenderView::allowContentType(ContentSettingsType settings_type,
                                   bool enabled_per_settings) {
   if (!enabled_per_settings)
     return false;
   // CONTENT_SETTING_ASK is only valid for cookies.
   if (current_content_settings_.settings[settings_type] == CONTENT_SETTING_BLOCK
@@ skipping 1084 matching lines @@
                                        int32 height,
                                        uint64 io_surface_identifier) {
   Send(new ViewHostMsg_GPUPluginSetIOSurface(
       routing_id(), window, width, height, io_surface_identifier));
 }
 
 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) {
   Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window));
 }
 #endif
-