| 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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 PrefService::UNSYNCABLE_PREF); | 261 PrefService::UNSYNCABLE_PREF); |
| 262 prefs->RegisterStringPref(prefs::kOAuth1Secret, | 262 prefs->RegisterStringPref(prefs::kOAuth1Secret, |
| 263 "", | 263 "", |
| 264 PrefService::UNSYNCABLE_PREF); | 264 PrefService::UNSYNCABLE_PREF); |
| 265 | 265 |
| 266 // TODO(wad): Once UI is connected, a final default can be set. At that point | 266 // TODO(wad): Once UI is connected, a final default can be set. At that point |
| 267 // change this pref from UNSYNCABLE to SYNCABLE. | 267 // change this pref from UNSYNCABLE to SYNCABLE. |
| 268 prefs->RegisterBooleanPref(prefs::kEnableCrosDRM, | 268 prefs->RegisterBooleanPref(prefs::kEnableCrosDRM, |
| 269 true, | 269 true, |
| 270 PrefService::UNSYNCABLE_PREF); | 270 PrefService::UNSYNCABLE_PREF); |
| 271 |
| 272 prefs->RegisterBooleanPref(prefs::kExternalStorageDisabled, |
| 273 false, |
| 274 PrefService::UNSYNCABLE_PREF); |
| 271 } | 275 } |
| 272 | 276 |
| 273 void Preferences::InitUserPrefs(PrefService* prefs) { | 277 void Preferences::InitUserPrefs(PrefService* prefs) { |
| 274 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); | 278 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); |
| 275 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, | 279 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, |
| 276 prefs, this); | 280 prefs, this); |
| 277 natural_scroll_.Init(prefs::kNaturalScroll, prefs, this); | 281 natural_scroll_.Init(prefs::kNaturalScroll, prefs, this); |
| 278 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this); | 282 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this); |
| 279 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, this); | 283 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, this); |
| 280 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); | 284 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 | 658 |
| 655 input_method::AutoRepeatRate rate; | 659 input_method::AutoRepeatRate rate; |
| 656 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); | 660 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); |
| 657 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); | 661 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); |
| 658 DCHECK(rate.initial_delay_in_ms > 0); | 662 DCHECK(rate.initial_delay_in_ms > 0); |
| 659 DCHECK(rate.repeat_interval_in_ms > 0); | 663 DCHECK(rate.repeat_interval_in_ms > 0); |
| 660 input_method::XKeyboard::SetAutoRepeatRate(rate); | 664 input_method::XKeyboard::SetAutoRepeatRate(rate); |
| 661 } | 665 } |
| 662 | 666 |
| 663 } // namespace chromeos | 667 } // namespace chromeos |
| OLD | NEW |