Remove text encoding UI

chrome/browser/ui/webui/options/font_settings_handler.cc

 // Copyright (c) 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 "chrome/browser/ui/webui/options/font_settings_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/character_encoding.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/webui/options/font_settings_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/font_list_async.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 50 matching lines @@
     { "fontSettingsStandard",
       IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_STANDARD_LABEL },
     { "fontSettingsSerif",
       IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL },
     { "fontSettingsSansSerif",
       IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SANS_SERIF_LABEL },
     { "fontSettingsFixedWidth",
       IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_FIXED_WIDTH_LABEL },
     { "fontSettingsMinimumSize",
       IDS_FONT_LANGUAGE_SETTING_MINIMUM_FONT_SIZE_TITLE },
-    { "fontSettingsEncoding",
-      IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_ENCODING_TITLE },
+    { "fontSettings",
+      IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_TITLE },
     { "fontSettingsSizeTiny",
       IDS_FONT_LANGUAGE_SETTING_FONT_SIZE_TINY },
     { "fontSettingsSizeHuge",
       IDS_FONT_LANGUAGE_SETTING_FONT_SIZE_HUGE },
     { "fontSettingsLoremIpsum",
       IDS_FONT_LANGUAGE_SETTING_LOREM_IPSUM },
     { "advancedFontSettingsOptions",
       IDS_FONT_LANGUAGE_SETTING_ADVANCED_FONT_SETTINGS_OPTIONS }
   };
 
@@ skipping 26 matching lines @@
   SetUpMinimumFontSample();
   NotifyAdvancedFontSettingsAvailability();
 }
 
 void FontSettingsHandler::RegisterMessages() {
   // Perform validation for saved fonts.
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   FontSettingsUtilities::ValidateSavedFonts(pref_service);
 
   // Register for preferences that we need to observe manually.
-  font_encoding_.Init(prefs::kDefaultCharset, pref_service);
-
   standard_font_.Init(prefs::kWebKitStandardFontFamily,
                       pref_service,
                       base::Bind(&FontSettingsHandler::SetUpStandardFontSample,
                                  base::Unretained(this)));
   serif_font_.Init(prefs::kWebKitSerifFontFamily,
                    pref_service,
                    base::Bind(&FontSettingsHandler::SetUpSerifFontSample,
                               base::Unretained(this)));
   sans_serif_font_.Init(
       prefs::kWebKitSansSerifFontFamily,
@@ skipping 52 matching lines @@
     base::ListValue* font;
     bool has_font = list->GetList(i, &font);
     DCHECK(has_font);
     base::string16 value;
     bool has_value = font->GetString(1, &value);
     DCHECK(has_value);
     bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(value);
     font->AppendString(has_rtl_chars ? "rtl" : "ltr");
   }
 
-  base::ListValue encoding_list;
-  const std::vector<CharacterEncoding::EncodingInfo>* encodings;
-  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  encodings = CharacterEncoding::GetCurrentDisplayEncodings(
-      g_browser_process->GetApplicationLocale(),
-      pref_service->GetString(prefs::kStaticEncodings),
-      pref_service->GetString(prefs::kRecentlySelectedEncoding));
-  DCHECK(encodings);
-  DCHECK(!encodings->empty());
-
-  std::vector<CharacterEncoding::EncodingInfo>::const_iterator it;
-  for (it = encodings->begin(); it != encodings->end(); ++it) {
-    std::unique_ptr<base::ListValue> option(new base::ListValue());
-    if (it->encoding_id) {
-      int cmd_id = it->encoding_id;
-      std::string encoding =
-      CharacterEncoding::GetCanonicalEncodingNameByCommandId(cmd_id);
-      base::string16 name = it->encoding_display_name;
-      bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(name);
-      option->AppendString(encoding);
-      option->AppendString(name);
-      option->AppendString(has_rtl_chars ? "rtl" : "ltr");
-    } else {
-      // Add empty name/value to indicate a separator item.
-      option->AppendString(std::string());
-      option->AppendString(std::string());
-    }
-    encoding_list.Append(std::move(option));
-  }
-
   base::ListValue selected_values;
   selected_values.AppendString(
       MaybeGetLocalizedFontName(standard_font_.GetValue()));
   selected_values.AppendString(
       MaybeGetLocalizedFontName(serif_font_.GetValue()));
   selected_values.AppendString(
       MaybeGetLocalizedFontName(sans_serif_font_.GetValue()));
   selected_values.AppendString(
       MaybeGetLocalizedFontName(fixed_font_.GetValue()));
-  selected_values.AppendString(font_encoding_.GetValue());
 
   web_ui()->CallJavascriptFunctionUnsafe(
-      "FontSettings.setFontsData", *list.get(), encoding_list, selected_values);
+      "FontSettings.setFontsData", *list.get(), selected_values);
 }
 
 void FontSettingsHandler::SetUpStandardFontSample() {
   base::StringValue font_value(standard_font_.GetValue());
   base::FundamentalValue size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpStandardFontSample",
                                          font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpSerifFontSample() {
@@ skipping 48 matching lines @@
       chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));
 }
 
 void FontSettingsHandler::OnWebKitDefaultFontSizeChanged() {
   SetUpStandardFontSample();
   SetUpSerifFontSample();
   SetUpSansSerifFontSample();
 }
 
 }  // namespace options