Remove text encoding UI

chrome/browser/character_encoding.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/character_encoding.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 19 matching lines @@
 const size_t kUserSelectedEncodingsMaxLength = 3;
 
 typedef struct {
   int resource_id;
   const char* name;
   int category_string_id;
 } CanonicalEncodingData;
 
 // An array of all supported canonical encoding names.
 const CanonicalEncodingData kCanonicalEncodingNames[] = {
   { IDC_ENCODING_UTF8, "UTF-8", IDS_ENCODING_UNICODE },

[msw, 2016/08/22 21:59:53]

Can we remove more here? Is GetCurrentDisplayEncodings still needed in
c/b/ui/webui/settings/font_handler.cc? Are the IDCs still needed at all?

[Jinsuk Kim, 2016/08/23 07:09:22]

Good catch. Removed the method. The array is necessary for
|GetCanonicalEncodingNameByAliasName| which is still in use.

But this class can be slimmed down even further if the array gets simplified for
|GetCanonicalEncodingNameByAliasName| only or just leave it all to ICU. Then all
the IDC_* can go away too. Maybe we need a test in place first.

   { IDC_ENCODING_UTF16LE, "UTF-16LE", IDS_ENCODING_UNICODE },
   { IDC_ENCODING_WINDOWS1252, "windows-1252", IDS_ENCODING_WESTERN },
   { IDC_ENCODING_GBK, "GBK", IDS_ENCODING_SIMP_CHINESE },
   { IDC_ENCODING_GB18030, "gb18030", IDS_ENCODING_SIMP_CHINESE },
   { IDC_ENCODING_BIG5, "Big5", IDS_ENCODING_TRAD_CHINESE },
   { IDC_ENCODING_KOREAN, "EUC-KR", IDS_ENCODING_KOREAN },
   { IDC_ENCODING_SHIFTJIS, "Shift_JIS", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_EUCJP, "EUC-JP", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_ISO2022JP, "ISO-2022-JP", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_THAI, "windows-874", IDS_ENCODING_THAI },
@@ skipping 283 matching lines @@
   DCHECK(map);
 
   IdToCanonicalEncodingNameMapType::const_iterator found_name = map->find(id);
   if (found_name != map->end())
     return GetEncodingDisplayName(found_name->second.first,
                                   found_name->second.second);
   return base::string16();
 }
 
 // Static.
-// Return count number of all supported canonical encoding.
-int CharacterEncoding::GetSupportCanonicalEncodingCount() {
-  return kCanonicalEncodingNamesLength;
-}
-
-// Static.
-std::string CharacterEncoding::GetCanonicalEncodingNameByIndex(int index) {
-  if (index < kCanonicalEncodingNamesLength)
-    return kCanonicalEncodingNames[index].name;
-  return std::string();
-}
-
-// Static.
-base::string16 CharacterEncoding::GetCanonicalEncodingDisplayNameByIndex(
-    int index) {
-  if (index < kCanonicalEncodingNamesLength)
-    return GetEncodingDisplayName(kCanonicalEncodingNames[index].name,
-        kCanonicalEncodingNames[index].category_string_id);
-  return base::string16();
-}
-
-// Static.
-int CharacterEncoding::GetEncodingCommandIdByIndex(int index) {
-  if (index < kCanonicalEncodingNamesLength)
-    return kCanonicalEncodingNames[index].resource_id;
-  return 0;
-}
-
-// Static.
 std::string CharacterEncoding::GetCanonicalEncodingNameByAliasName(
     const std::string& alias_name) {
   // If the input alias_name is already canonical encoding name, just return it.
   const CanonicalEncodingNameToIdMapType* map =
       CanonicalEncodingMapSingleton()->GetCanonicalEncodingNameToIdMapData();
   DCHECK(map);
 
   CanonicalEncodingNameToIdMapType::const_iterator found_id =
       map->find(alias_name);
   if (found_id != map->end())
@@ skipping 94 matching lines @@
     // Sort the encoding list.
     l10n_util::SortVectorWithStringKey(locale,
                                        encoding_list,
                                        start_sorted_index,
                                        encoding_list->size(),
                                        true);
   }
   DCHECK(!encoding_list->empty());
   return encoding_list;
 }
-
-// Static
-bool CharacterEncoding::UpdateRecentlySelectedEncoding(
-    const std::string& original_selected_encodings,
-    int new_selected_encoding_id,
-    std::string* selected_encodings) {
-  // Get encoding name.
-  std::string encoding_name =
-      GetCanonicalEncodingNameByCommandId(new_selected_encoding_id);
-  DCHECK(!encoding_name.empty());
-  // Check whether the new encoding is in local dependent encodings or original
-  // recently selected encodings. If yes, do not add it.
-  std::vector<int>* locale_dependent_encoding_list =
-      CanonicalEncodingMapSingleton()->locale_dependent_encoding_ids();
-  DCHECK(locale_dependent_encoding_list);
-  std::vector<int> selected_encoding_list;
-  ParseEncodingListSeparatedWithComma(original_selected_encodings,
-                                      &selected_encoding_list,
-                                      kUserSelectedEncodingsMaxLength);
-  // Put 'cached encodings' (dynamic encoding list) after 'local dependent
-  // encoding list' for check.
-  std::vector<int> top_encoding_list(*locale_dependent_encoding_list);
-  // UTF8 is always in our optimized encoding list.
-  top_encoding_list.insert(top_encoding_list.begin(), IDC_ENCODING_UTF8);
-  top_encoding_list.insert(top_encoding_list.end(),
-                           selected_encoding_list.begin(),
-                           selected_encoding_list.end());
-  for (std::vector<int>::const_iterator it = top_encoding_list.begin();
-       it != top_encoding_list.end(); ++it)
-    if (*it == new_selected_encoding_id)
-      return false;
-  // Need to add the encoding id to recently selected encoding list.
-  // Remove the last encoding in original list.
-  if (selected_encoding_list.size() == kUserSelectedEncodingsMaxLength)
-    selected_encoding_list.pop_back();
-  // Insert new encoding to head of selected encoding list.
-  *selected_encodings = encoding_name;
-  // Generate the string for rest selected encoding list.
-  for (std::vector<int>::const_iterator it = selected_encoding_list.begin();
-       it != selected_encoding_list.end(); ++it) {
-    selected_encodings->append(1, L',');
-    selected_encodings->append(GetCanonicalEncodingNameByCommandId(*it));
-  }
-  return true;
-}