Index: chrome/browser/chromeos/preferences.cc |
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc |
index fce3ef5874c5f93a72c35748c02a16bd8499ba37..36d49cc4680866f78b4ba5e5d1bf20d617ae44ea 100644 |
--- a/chrome/browser/chromeos/preferences.cc |
+++ b/chrome/browser/chromeos/preferences.cc |
@@ -233,6 +233,9 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) { |
prefs->RegisterIntegerPref(prefs::kLanguageRemapCapsLockKeyTo, |
input_method::kCapsLockKey, |
PrefService::SYNCABLE_PREF); |
+ prefs->RegisterBooleanPref(prefs::kLanguageSearchKeyActsAsFunctionKey, |
+ false, |
+ PrefService::SYNCABLE_PREF); |
// We don't sync the following keyboard prefs since they are not user- |
// configurable. |
prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled, |
@@ -363,6 +366,8 @@ void Preferences::InitUserPrefs(PrefService* prefs) { |
mozc_integer_prefs_[i].Init( |
language_prefs::kMozcIntegerPrefs[i].pref_name, prefs, callback); |
} |
+ search_key_acts_as_function_key_.Init( |
+ prefs::kLanguageSearchKeyActsAsFunctionKey, prefs, callback); |
xkb_auto_repeat_enabled_.Init( |
prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback); |
xkb_auto_repeat_delay_pref_.Init( |
@@ -517,6 +522,13 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { |
// preferencs, we don't need to send this to ibus-daemon. |
} |
+ if (!pref_name || *pref_name == prefs::kLanguageSearchKeyActsAsFunctionKey) { |
+ const bool right = search_key_acts_as_function_key_.GetValue(); |
+ PrefService* prefs = g_browser_process->local_state(); |
Yusuke Sato
2012/11/26 06:09:38
For consistency, I'd prefer not to reflect the own
danakj
2012/11/26 17:20:16
Oh I had trouble with the setting being loaded cor
danakj
2012/11/26 19:36:26
Done.
|
+ if (prefs->GetBoolean(prefs::kLanguageSearchKeyActsAsFunctionKey) != right) |
+ prefs->SetBoolean(prefs::kLanguageSearchKeyActsAsFunctionKey, right); |
+ } |
+ |
if (!pref_name || *pref_name == prefs::kLanguageXkbAutoRepeatEnabled) { |
const bool enabled = xkb_auto_repeat_enabled_.GetValue(); |
input_method::XKeyboard::SetAutoRepeatEnabled(enabled); |