OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
570 Profile* profile; | 570 Profile* profile; |
571 }; | 571 }; |
572 | 572 |
573 // static | 573 // static |
574 void GuestLanguageSetCallbackData::Callback( | 574 void GuestLanguageSetCallbackData::Callback( |
575 const scoped_ptr<GuestLanguageSetCallbackData>& self, | 575 const scoped_ptr<GuestLanguageSetCallbackData>& self, |
576 const std::string& locale, | 576 const std::string& locale, |
577 const std::string& loaded_locale, | 577 const std::string& loaded_locale, |
578 bool success) { | 578 bool success) { |
579 input_method::InputMethodManager* const ime_manager = | 579 input_method::InputMethodManager* const ime_manager = |
580 input_method::InputMethodManager::Get(); | 580 input_method::InputMethodManager::Get(); |
Alexander Alekseev
2014/02/11 13:36:02
Need to enable here all the other (non-login) hard
Seigo Nonaka
2014/02/12 13:21:02
Done.
| |
581 // Active layout must be hardware "login layout". | 581 // Active layout must be hardware "login layout". |
582 // The previous one must be "locale default layout". | 582 // The previous one must be "locale default layout". |
583 const std::string login_input_method = | 583 std::vector<std::string> login_input_methods; |
584 ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId(); | 584 ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId( |
585 ime_manager->ChangeInputMethod(login_input_method); | 585 &login_input_methods); |
586 ime_manager->ChangeInputMethod( | |
587 login_input_methods.empty() ? "" : login_input_methods[0]); | |
586 | 588 |
587 const std::string locale_default_input_method = | 589 const std::string locale_default_input_method = |
588 ime_manager->GetInputMethodUtil()-> | 590 ime_manager->GetInputMethodUtil()-> |
589 GetLanguageDefaultInputMethodId(loaded_locale); | 591 GetLanguageDefaultInputMethodId(loaded_locale); |
590 if (!locale_default_input_method.empty()) { | 592 if (!locale_default_input_method.empty()) { |
591 PrefService* user_prefs = self->profile->GetPrefs(); | 593 PrefService* user_prefs = self->profile->GetPrefs(); |
592 user_prefs->SetString(prefs::kLanguagePreviousInputMethod, | 594 user_prefs->SetString(prefs::kLanguagePreviousInputMethod, |
593 locale_default_input_method); | 595 locale_default_input_method); |
594 } | 596 } |
595 } | 597 } |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
826 // Destroy DBus services immediately after threads are stopped. | 828 // Destroy DBus services immediately after threads are stopped. |
827 dbus_services_.reset(); | 829 dbus_services_.reset(); |
828 | 830 |
829 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 831 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
830 | 832 |
831 // Destroy DeviceSettingsService after g_browser_process. | 833 // Destroy DeviceSettingsService after g_browser_process. |
832 DeviceSettingsService::Shutdown(); | 834 DeviceSettingsService::Shutdown(); |
833 } | 835 } |
834 | 836 |
835 } // namespace chromeos | 837 } // namespace chromeos |
OLD | NEW |