diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 05:49:44 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 05:49:44 +0000 |
| commit | 1d322f90a05be438299ce879ab47d8b94ecfb60e (patch) | |
| tree | 11a9ece3eede78ecbcd01ecc3e12d35348da1e12 /chrome/browser/chromeos/options | |
| parent | 0dc29cde34e490141440282d942df73fb14d687a (diff) | |
| download | chromium_src-1d322f90a05be438299ce879ab47d8b94ecfb60e.zip chromium_src-1d322f90a05be438299ce879ab47d8b94ecfb60e.tar.gz chromium_src-1d322f90a05be438299ce879ab47d8b94ecfb60e.tar.bz2 | |
Clean up latin-pre/post special handling in input method code.
This is a follow-up CL of
http://codereview.chromium.org/3041054
which removed m17n:t:* (latin-pre/post) from input method ID whitelist.
We had some special cases here and there for these IDs and I removed them.
Patch from kochi@chromium.org.
BUG=chromium-os:5439
TEST=run unittest (LanguageMenuButtonTest, InputMethodUtilTest)
Review URL: http://codereview.chromium.org/3122005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/options')
| -rw-r--r-- | chrome/browser/chromeos/options/language_config_model.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/chromeos/options/language_config_view.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/options/language_config_model.cc b/chrome/browser/chromeos/options/language_config_model.cc index e045506..c0d3cfd 100644 --- a/chrome/browser/chromeos/options/language_config_model.cc +++ b/chrome/browser/chromeos/options/language_config_model.cc @@ -36,8 +36,7 @@ std::wstring AddLanguageComboboxModel::GetItemAt(int index) { return l10n_util::GetString( IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_LANGUAGE_COMBOBOX); } - return input_method::MaybeRewriteLanguageName( - GetLanguageNameAt(GetLanguageIndex(index))); + return GetLanguageNameAt(GetLanguageIndex(index)); } int AddLanguageComboboxModel::GetLanguageIndex(int index) const { diff --git a/chrome/browser/chromeos/options/language_config_view.cc b/chrome/browser/chromeos/options/language_config_view.cc index d9f482e..8de7688 100644 --- a/chrome/browser/chromeos/options/language_config_view.cc +++ b/chrome/browser/chromeos/options/language_config_view.cc @@ -515,8 +515,7 @@ void LanguageConfigView::AddUiLanguageSection(const std::string& language_code, g_browser_process->GetApplicationLocale(); const string16 language_name16 = l10n_util::GetDisplayNameForLocale( language_code, application_locale, true); - const std::wstring language_name - = input_method::MaybeRewriteLanguageName(UTF16ToWide(language_name16)); + const std::wstring language_name = UTF16ToWide(language_name16); views::Label* language_name_label = new views::Label(language_name); language_name_label->SetFont( language_name_label->font().DeriveFont(0, gfx::Font::BOLD)); |