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

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

Issue 15734010: chromeos: Add delay between screen off and lock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 277 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
278 registry->RegisterIntegerPref( 278 registry->RegisterIntegerPref(
279 prefs::kLanguageXkbAutoRepeatDelay, 279 prefs::kLanguageXkbAutoRepeatDelay,
280 language_prefs::kXkbAutoRepeatDelayInMs, 280 language_prefs::kXkbAutoRepeatDelayInMs,
281 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 281 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
282 registry->RegisterIntegerPref( 282 registry->RegisterIntegerPref(
283 prefs::kLanguageXkbAutoRepeatInterval, 283 prefs::kLanguageXkbAutoRepeatInterval,
284 language_prefs::kXkbAutoRepeatIntervalInMs, 284 language_prefs::kXkbAutoRepeatIntervalInMs,
285 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 285 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
286 286
287 // Screen lock default to off.
288 registry->RegisterBooleanPref( 287 registry->RegisterBooleanPref(
289 prefs::kEnableScreenLock, 288 prefs::kEnableScreenLock,
290 false, 289 false,
291 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 290 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
292 291
293 // Mobile plan notifications default to on. 292 // Mobile plan notifications default to on.
294 registry->RegisterBooleanPref( 293 registry->RegisterBooleanPref(
295 prefs::kShowPlanNotifications, 294 prefs::kShowPlanNotifications,
296 true, 295 true,
297 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 296 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
(...skipping 18 matching lines...) Expand all
316 registry->RegisterIntegerPref( 315 registry->RegisterIntegerPref(
317 prefs::kPowerAcScreenDimDelayMs, 316 prefs::kPowerAcScreenDimDelayMs,
318 420000, 317 420000,
319 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 318 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
320 registry->RegisterIntegerPref( 319 registry->RegisterIntegerPref(
321 prefs::kPowerAcScreenOffDelayMs, 320 prefs::kPowerAcScreenOffDelayMs,
322 480000, 321 480000,
323 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 322 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
324 registry->RegisterIntegerPref( 323 registry->RegisterIntegerPref(
325 prefs::kPowerAcScreenLockDelayMs, 324 prefs::kPowerAcScreenLockDelayMs,
326 0, 325 490000,
Mattias Nissler (ping if slow) 2013/05/31 13:22:46 This would be 0 again.
327 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 326 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
328 registry->RegisterIntegerPref( 327 registry->RegisterIntegerPref(
329 prefs::kPowerAcIdleWarningDelayMs, 328 prefs::kPowerAcIdleWarningDelayMs,
330 0, 329 0,
331 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 330 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
332 registry->RegisterIntegerPref( 331 registry->RegisterIntegerPref(
333 prefs::kPowerAcIdleDelayMs, 332 prefs::kPowerAcIdleDelayMs,
334 1800000, 333 1800000,
335 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 334 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
336 registry->RegisterIntegerPref( 335 registry->RegisterIntegerPref(
337 prefs::kPowerBatteryScreenDimDelayMs, 336 prefs::kPowerBatteryScreenDimDelayMs,
338 300000, 337 300000,
339 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 338 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
340 registry->RegisterIntegerPref( 339 registry->RegisterIntegerPref(
341 prefs::kPowerBatteryScreenOffDelayMs, 340 prefs::kPowerBatteryScreenOffDelayMs,
342 360000, 341 360000,
343 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 342 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
344 registry->RegisterIntegerPref( 343 registry->RegisterIntegerPref(
345 prefs::kPowerBatteryScreenLockDelayMs, 344 prefs::kPowerBatteryScreenLockDelayMs,
346 0, 345 370000,
Mattias Nissler (ping if slow) 2013/05/31 13:22:46 Same here.
347 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 346 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
348 registry->RegisterIntegerPref( 347 registry->RegisterIntegerPref(
349 prefs::kPowerBatteryIdleWarningDelayMs, 348 prefs::kPowerBatteryIdleWarningDelayMs,
350 0, 349 0,
351 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 350 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
352 registry->RegisterIntegerPref( 351 registry->RegisterIntegerPref(
353 prefs::kPowerBatteryIdleDelayMs, 352 prefs::kPowerBatteryIdleDelayMs,
354 600000, 353 600000,
355 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 354 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
356 registry->RegisterIntegerPref( 355 registry->RegisterIntegerPref(
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 983
985 input_method::AutoRepeatRate rate; 984 input_method::AutoRepeatRate rate;
986 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); 985 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
987 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); 986 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
988 DCHECK(rate.initial_delay_in_ms > 0); 987 DCHECK(rate.initial_delay_in_ms > 0);
989 DCHECK(rate.repeat_interval_in_ms > 0); 988 DCHECK(rate.repeat_interval_in_ms > 0);
990 input_method::XKeyboard::SetAutoRepeatRate(rate); 989 input_method::XKeyboard::SetAutoRepeatRate(rate);
991 } 990 }
992 991
993 } // namespace chromeos 992 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698