| 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 "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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 prefs->RegisterBooleanPref(prefs::kShow3gPromoNotification, | 267 prefs->RegisterBooleanPref(prefs::kShow3gPromoNotification, |
| 268 true, | 268 true, |
| 269 PrefServiceSyncable::UNSYNCABLE_PREF); | 269 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 270 | 270 |
| 271 // Initially all existing users would see "What's new" | 271 // Initially all existing users would see "What's new" |
| 272 // for current version after update. | 272 // for current version after update. |
| 273 prefs->RegisterStringPref(prefs::kChromeOSReleaseNotesVersion, | 273 prefs->RegisterStringPref(prefs::kChromeOSReleaseNotesVersion, |
| 274 "0.0.0.0", | 274 "0.0.0.0", |
| 275 PrefServiceSyncable::SYNCABLE_PREF); | 275 PrefServiceSyncable::SYNCABLE_PREF); |
| 276 | 276 |
| 277 // OAuth1 all access token and secret pair. | 277 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceOAuth1)) { |
| 278 prefs->RegisterStringPref(prefs::kOAuth1Token, | 278 // Legacy OAuth1 all access token and secret pair. |
| 279 "", | 279 prefs->RegisterStringPref(prefs::kOAuth1Token, |
| 280 PrefServiceSyncable::UNSYNCABLE_PREF); | 280 "", |
| 281 prefs->RegisterStringPref(prefs::kOAuth1Secret, | 281 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 282 "", | 282 prefs->RegisterStringPref(prefs::kOAuth1Secret, |
| 283 PrefServiceSyncable::UNSYNCABLE_PREF); | 283 "", |
| 284 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 285 } |
| 284 | 286 |
| 285 // TODO(wad): Once UI is connected, a final default can be set. At that point | 287 // TODO(wad): Once UI is connected, a final default can be set. At that point |
| 286 // change this pref from UNSYNCABLE to SYNCABLE. | 288 // change this pref from UNSYNCABLE to SYNCABLE. |
| 287 prefs->RegisterBooleanPref(prefs::kEnableCrosDRM, | 289 prefs->RegisterBooleanPref(prefs::kEnableCrosDRM, |
| 288 true, | 290 true, |
| 289 PrefServiceSyncable::UNSYNCABLE_PREF); | 291 PrefServiceSyncable::UNSYNCABLE_PREF); |
| 290 | 292 |
| 291 prefs->RegisterBooleanPref(prefs::kExternalStorageDisabled, | 293 prefs->RegisterBooleanPref(prefs::kExternalStorageDisabled, |
| 292 false, | 294 false, |
| 293 PrefServiceSyncable::UNSYNCABLE_PREF); | 295 PrefServiceSyncable::UNSYNCABLE_PREF); |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 | 785 |
| 784 input_method::AutoRepeatRate rate; | 786 input_method::AutoRepeatRate rate; |
| 785 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); | 787 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); |
| 786 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); | 788 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); |
| 787 DCHECK(rate.initial_delay_in_ms > 0); | 789 DCHECK(rate.initial_delay_in_ms > 0); |
| 788 DCHECK(rate.repeat_interval_in_ms > 0); | 790 DCHECK(rate.repeat_interval_in_ms > 0); |
| 789 input_method::XKeyboard::SetAutoRepeatRate(rate); | 791 input_method::XKeyboard::SetAutoRepeatRate(rate); |
| 790 } | 792 } |
| 791 | 793 |
| 792 } // namespace chromeos | 794 } // namespace chromeos |
| OLD | NEW |