| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index da1c2b50f824061fe8431b3c1b5a96837cdfd4df..f39d7970245d711223b3e2aeb37726b1ce98ae60 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -452,9 +452,7 @@ class GuestLanguageSetCallbackData {
|
|
|
| // Must match SwitchLanguageCallback type.
|
| static void Callback(const scoped_ptr<GuestLanguageSetCallbackData>& self,
|
| - const std::string& locale,
|
| - const std::string& loaded_locale,
|
| - bool success);
|
| + scoped_ptr<locale_util::LanguageSwitchResult> result);
|
|
|
| Profile* profile;
|
| };
|
| @@ -462,9 +460,7 @@ class GuestLanguageSetCallbackData {
|
| // static
|
| void GuestLanguageSetCallbackData::Callback(
|
| const scoped_ptr<GuestLanguageSetCallbackData>& self,
|
| - const std::string& locale,
|
| - const std::string& loaded_locale,
|
| - bool success) {
|
| + scoped_ptr<locale_util::LanguageSwitchResult> result) {
|
| input_method::InputMethodManager* manager =
|
| input_method::InputMethodManager::Get();
|
| scoped_refptr<input_method::InputMethodManager::State> ime_state =
|
| @@ -480,7 +476,7 @@ void GuestLanguageSetCallbackData::Callback(
|
| // Second, enable locale based input methods.
|
| const std::string locale_default_input_method =
|
| manager->GetInputMethodUtil()->GetLanguageDefaultInputMethodId(
|
| - loaded_locale);
|
| + result->loaded_locale);
|
| if (!locale_default_input_method.empty()) {
|
| PrefService* user_prefs = self->profile->GetPrefs();
|
| user_prefs->SetString(prefs::kLanguagePreviousInputMethod,
|
|
|