Roll src/third_party/icu 8ac906f:d8b2a9d (svn 292317:292476)

chrome/browser/ui/toolbar/encoding_menu_controller.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/toolbar/encoding_menu_controller.h"
 
 #include "base/i18n/rtl.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 const int EncodingMenuController::kValidEncodingIds[] = {
     IDC_ENCODING_UTF8,
     IDC_ENCODING_UTF16LE,
-    IDC_ENCODING_ISO88591,
     IDC_ENCODING_WINDOWS1252,
     IDC_ENCODING_GBK,
     IDC_ENCODING_GB18030,
     IDC_ENCODING_BIG5,
     IDC_ENCODING_BIG5HKSCS,
     IDC_ENCODING_KOREAN,
     IDC_ENCODING_SHIFTJIS,
     IDC_ENCODING_ISO2022JP,
     IDC_ENCODING_EUCJP,
     IDC_ENCODING_THAI,
@@ skipping 99 matching lines @@
   for (it = encodings->begin(); it != encodings->end(); ++it) {
     if (it->encoding_id) {
       base::string16 encoding = it->encoding_display_name;
       base::i18n::AdjustStringForLocaleDirection(&encoding);
       menu_items->push_back(EncodingMenuItem(it->encoding_id, encoding));
     } else {
       menu_items->push_back(separator);
     }
   }
 }