Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 10831204: Fix for number of ChromeOS browser_tests that were failing in BVTs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options2/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
}
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options2/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698