diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 10:12:21 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 10:12:21 +0000 |
| commit | 1e8e765e76578341934e7285afa6b4e12b4f8c6e (patch) | |
| tree | 9d6f8f21cf5a5b75938b40a6431343ae74672330 /chrome/browser/chromeos/options/language_config_view.cc | |
| parent | e713a43daff36ba4317c7585a1a6ea056f49cb8c (diff) | |
| download | chromium_src-1e8e765e76578341934e7285afa6b4e12b4f8c6e.zip chromium_src-1e8e765e76578341934e7285afa6b4e12b4f8c6e.tar.gz chromium_src-1e8e765e76578341934e7285afa6b4e12b4f8c6e.tar.bz2 | |
Added input_method_util.h.
- Moved all functions in language_menu_l10n_util.h to the new file.
- Moved static methods in language_library.h and language_config_model.h to the file.
BUG=none
TEST=try bot passed
Review URL: http://codereview.chromium.org/2810008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/options/language_config_view.cc')
| -rw-r--r-- | chrome/browser/chromeos/options/language_config_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/options/language_config_view.cc b/chrome/browser/chromeos/options/language_config_view.cc index fddf73a..e4cb32c 100644 --- a/chrome/browser/chromeos/options/language_config_view.cc +++ b/chrome/browser/chromeos/options/language_config_view.cc @@ -9,6 +9,7 @@ #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/options/language_chewing_config_view.h" #include "chrome/browser/chromeos/options/language_hangul_config_view.h" #include "chrome/browser/chromeos/options/language_mozc_config_view.h" @@ -238,8 +239,8 @@ void LanguageConfigView::OnSelectionChanged() { std::wstring LanguageConfigView::GetText(int row, int column_id) { if (row >= 0 && row < static_cast<int>( model.num_preferred_language_codes())) { - return LanguageConfigModel:: - GetLanguageDisplayNameFromCode(model.preferred_language_code_at(row)); + return input_method::GetLanguageDisplayNameFromCode( + model.preferred_language_code_at(row)); } NOTREACHED(); return L""; @@ -523,8 +524,7 @@ void LanguageConfigView::AddUiLanguageSection(const std::string& language_code, const string16 language_name16 = l10n_util::GetDisplayNameForLocale( language_code, application_locale, true); const std::wstring language_name - = LanguageConfigModel::MaybeRewriteLanguageName( - UTF16ToWide(language_name16)); + = input_method::MaybeRewriteLanguageName(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)); |