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

Side by Side Diff: chrome/browser/chromeos/preferences.cc

Issue 11943009: Add diamond-key remapping support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comment Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/preferences.h" 5 #include "chrome/browser/chromeos/preferences.h"
6 6
7 #include "ash/magnifier/magnifier_constants.h" 7 #include "ash/magnifier/magnifier_constants.h"
8 #include "base/chromeos/chromeos_version.h" 8 #include "base/chromeos/chromeos_version.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 PrefServiceSyncable::SYNCABLE_PREF); 234 PrefServiceSyncable::SYNCABLE_PREF);
235 prefs->RegisterIntegerPref(prefs::kLanguageRemapControlKeyTo, 235 prefs->RegisterIntegerPref(prefs::kLanguageRemapControlKeyTo,
236 input_method::kControlKey, 236 input_method::kControlKey,
237 PrefServiceSyncable::SYNCABLE_PREF); 237 PrefServiceSyncable::SYNCABLE_PREF);
238 prefs->RegisterIntegerPref(prefs::kLanguageRemapAltKeyTo, 238 prefs->RegisterIntegerPref(prefs::kLanguageRemapAltKeyTo,
239 input_method::kAltKey, 239 input_method::kAltKey,
240 PrefServiceSyncable::SYNCABLE_PREF); 240 PrefServiceSyncable::SYNCABLE_PREF);
241 prefs->RegisterIntegerPref(prefs::kLanguageRemapCapsLockKeyTo, 241 prefs->RegisterIntegerPref(prefs::kLanguageRemapCapsLockKeyTo,
242 input_method::kCapsLockKey, 242 input_method::kCapsLockKey,
243 PrefServiceSyncable::SYNCABLE_PREF); 243 PrefServiceSyncable::SYNCABLE_PREF);
244 prefs->RegisterIntegerPref(prefs::kLanguageRemapDiamondKeyTo,
245 input_method::kControlKey,
246 PrefServiceSyncable::SYNCABLE_PREF);
244 // We don't sync the following keyboard prefs since they are not user- 247 // We don't sync the following keyboard prefs since they are not user-
245 // configurable. 248 // configurable.
246 prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled, 249 prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled,
247 true, 250 true,
248 PrefServiceSyncable::UNSYNCABLE_PREF); 251 PrefServiceSyncable::UNSYNCABLE_PREF);
249 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatDelay, 252 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatDelay,
250 language_prefs::kXkbAutoRepeatDelayInMs, 253 language_prefs::kXkbAutoRepeatDelayInMs,
251 PrefServiceSyncable::UNSYNCABLE_PREF); 254 PrefServiceSyncable::UNSYNCABLE_PREF);
252 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatInterval, 255 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatInterval,
253 language_prefs::kXkbAutoRepeatIntervalInMs, 256 language_prefs::kXkbAutoRepeatIntervalInMs,
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 788
786 input_method::AutoRepeatRate rate; 789 input_method::AutoRepeatRate rate;
787 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); 790 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
788 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); 791 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
789 DCHECK(rate.initial_delay_in_ms > 0); 792 DCHECK(rate.initial_delay_in_ms > 0);
790 DCHECK(rate.repeat_interval_in_ms > 0); 793 DCHECK(rate.repeat_interval_in_ms > 0);
791 input_method::XKeyboard::SetAutoRepeatRate(rate); 794 input_method::XKeyboard::SetAutoRepeatRate(rate);
792 } 795 }
793 796
794 } // namespace chromeos 797 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698