| Index: chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
|
| index 56e1190b8ae0ea6daf22b04a5414c26f97cd28ad..50a70b801bd5f77f926f4a7f07a4ccd8f256dbc3 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/prefs/pref_service.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/common/pref_names.h"
|
| +#include "ui/base/l10n/l10n_util.h"
|
|
|
| namespace chromeos {
|
| namespace input_method {
|
| @@ -25,12 +26,17 @@ std::string InputMethodDelegateImpl::GetHardwareKeyboardLayout() const {
|
| return std::string();
|
| }
|
|
|
| -std::string InputMethodDelegateImpl::GetActiveLocale() const {
|
| - if (g_browser_process)
|
| - return g_browser_process->GetApplicationLocale();
|
| +string16 InputMethodDelegateImpl::GetLocalizedString(int resource_id) const {
|
| + return l10n_util::GetStringUTF16(resource_id);
|
| +}
|
|
|
| - NOTREACHED();
|
| - return std::string();
|
| +string16 InputMethodDelegateImpl::GetDisplayLanguageName(
|
| + const std::string& language_code) const {
|
| + DCHECK(g_browser_process);
|
| + return l10n_util::GetDisplayNameForLocale(
|
| + language_code,
|
| + g_browser_process->GetApplicationLocale(),
|
| + true);
|
| }
|
|
|
| } // namespace input_method
|
|
|