| Index: chrome/browser/chromeos/preferences.cc
|
| diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
|
| index a08db85ba5e4fd044fc3b7d09aadb7ad50e798b5..897e5f4445c8265692b6a2dfd1673d2101a3b06b 100644
|
| --- a/chrome/browser/chromeos/preferences.cc
|
| +++ b/chrome/browser/chromeos/preferences.cc
|
| @@ -71,8 +71,10 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
|
| if (base::chromeos::IsRunningOnChromeOS()) {
|
| input_method::InputMethodManager* manager =
|
| input_method::InputMethodManager::GetInstance();
|
| - hardware_keyboard_id =
|
| - manager->GetInputMethodUtil()->GetHardwareInputMethodId();
|
| + if (manager) {
|
| + hardware_keyboard_id =
|
| + manager->GetInputMethodUtil()->GetHardwareInputMethodId();
|
| + }
|
| } else {
|
| hardware_keyboard_id = "xkb:us::eng"; // only for testing.
|
| }
|
|
|