OLD | NEW |
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 "base/chromeos/chromeos_version.h" | 7 #include "base/chromeos/chromeos_version.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/i18n/time_formatting.h" | 9 #include "base/i18n/time_formatting.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 PrefService::SYNCABLE_PREF); | 70 PrefService::SYNCABLE_PREF); |
71 prefs->RegisterBooleanPref(prefs::kTapDraggingEnabled, | 71 prefs->RegisterBooleanPref(prefs::kTapDraggingEnabled, |
72 false, | 72 false, |
73 PrefService::SYNCABLE_PREF); | 73 PrefService::SYNCABLE_PREF); |
74 prefs->RegisterBooleanPref(prefs::kEnableTouchpadThreeFingerClick, | 74 prefs->RegisterBooleanPref(prefs::kEnableTouchpadThreeFingerClick, |
75 false, | 75 false, |
76 PrefService::UNSYNCABLE_PREF); | 76 PrefService::UNSYNCABLE_PREF); |
77 prefs->RegisterBooleanPref(prefs::kEnableTouchpadThreeFingerSwipe, | 77 prefs->RegisterBooleanPref(prefs::kEnableTouchpadThreeFingerSwipe, |
78 false, | 78 false, |
79 PrefService::UNSYNCABLE_PREF); | 79 PrefService::UNSYNCABLE_PREF); |
80 prefs->RegisterBooleanPref(prefs::kNaturalScroll, | 80 prefs->RegisterBooleanPref( |
81 false, | 81 prefs::kNaturalScroll, |
82 PrefService::SYNCABLE_PREF); | 82 CommandLine::ForCurrentProcess()->HasSwitch( |
| 83 switches::kNaturalScrollDefault), |
| 84 PrefService::SYNCABLE_PREF); |
83 prefs->RegisterBooleanPref(prefs::kPrimaryMouseButtonRight, | 85 prefs->RegisterBooleanPref(prefs::kPrimaryMouseButtonRight, |
84 false, | 86 false, |
85 PrefService::SYNCABLE_PREF); | 87 PrefService::SYNCABLE_PREF); |
86 prefs->RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, | 88 prefs->RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, |
87 false, | 89 false, |
88 PrefService::UNSYNCABLE_PREF); | 90 PrefService::UNSYNCABLE_PREF); |
89 prefs->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, | 91 prefs->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, |
90 false, | 92 false, |
91 PrefService::UNSYNCABLE_PREF); | 93 PrefService::UNSYNCABLE_PREF); |
92 // Check if the accessibility pref is already registered, which can happen | 94 // Check if the accessibility pref is already registered, which can happen |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 | 765 |
764 input_method::AutoRepeatRate rate; | 766 input_method::AutoRepeatRate rate; |
765 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); | 767 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); |
766 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); | 768 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); |
767 DCHECK(rate.initial_delay_in_ms > 0); | 769 DCHECK(rate.initial_delay_in_ms > 0); |
768 DCHECK(rate.repeat_interval_in_ms > 0); | 770 DCHECK(rate.repeat_interval_in_ms > 0); |
769 input_method::XKeyboard::SetAutoRepeatRate(rate); | 771 input_method::XKeyboard::SetAutoRepeatRate(rate); |
770 } | 772 } |
771 | 773 |
772 } // namespace chromeos | 774 } // namespace chromeos |
OLD | NEW |