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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 PrefService::UNSYNCABLE_PREF); | 264 PrefService::UNSYNCABLE_PREF); |
265 prefs->RegisterStringPref(prefs::kOAuth1Secret, | 265 prefs->RegisterStringPref(prefs::kOAuth1Secret, |
266 "", | 266 "", |
267 PrefService::UNSYNCABLE_PREF); | 267 PrefService::UNSYNCABLE_PREF); |
268 | 268 |
269 // TODO(wad): Once UI is connected, a final default can be set. At that point | 269 // TODO(wad): Once UI is connected, a final default can be set. At that point |
270 // change this pref from UNSYNCABLE to SYNCABLE. | 270 // change this pref from UNSYNCABLE to SYNCABLE. |
271 prefs->RegisterBooleanPref(prefs::kEnableCrosDRM, | 271 prefs->RegisterBooleanPref(prefs::kEnableCrosDRM, |
272 true, | 272 true, |
273 PrefService::UNSYNCABLE_PREF); | 273 PrefService::UNSYNCABLE_PREF); |
| 274 |
| 275 prefs->RegisterBooleanPref(prefs::kExternalStorageDisabled, |
| 276 false, |
| 277 PrefService::UNSYNCABLE_PREF); |
274 } | 278 } |
275 | 279 |
276 void Preferences::InitUserPrefs(PrefService* prefs) { | 280 void Preferences::InitUserPrefs(PrefService* prefs) { |
277 prefs_ = prefs; | 281 prefs_ = prefs; |
278 | 282 |
279 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); | 283 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); |
280 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, | 284 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, |
281 prefs, this); | 285 prefs, this); |
282 natural_scroll_.Init(prefs::kNaturalScroll, prefs, this); | 286 natural_scroll_.Init(prefs::kNaturalScroll, prefs, this); |
283 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this); | 287 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this); |
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
672 | 676 |
673 input_method::AutoRepeatRate rate; | 677 input_method::AutoRepeatRate rate; |
674 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); | 678 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); |
675 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); | 679 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); |
676 DCHECK(rate.initial_delay_in_ms > 0); | 680 DCHECK(rate.initial_delay_in_ms > 0); |
677 DCHECK(rate.repeat_interval_in_ms > 0); | 681 DCHECK(rate.repeat_interval_in_ms > 0); |
678 input_method::XKeyboard::SetAutoRepeatRate(rate); | 682 input_method::XKeyboard::SetAutoRepeatRate(rate); |
679 } | 683 } |
680 | 684 |
681 } // namespace chromeos | 685 } // namespace chromeos |
OLD | NEW |