chrome/browser/chromeos/preferences.cc - Issue 17408010: Replace PresentationIdleDelayScale with PresentationScreenDimDelayScale

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

Issue 17408010: Replace PresentationIdleDelayScale with PresentationScreenDimDelayScale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 7 years, 6 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

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 "ash/shell_delegate.h"	8 #include "ash/shell_delegate.h"

9 #include "base/chromeos/chromeos_version.h"	9 #include "base/chromeos/chromeos_version.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

(...skipping 372 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
383 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);	383 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

384 registry->RegisterBooleanPref(	384 registry->RegisterBooleanPref(

385 prefs::kPowerUseVideoActivity,	385 prefs::kPowerUseVideoActivity,

386 true,	386 true,

387 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);	387 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

388 registry->RegisterBooleanPref(	388 registry->RegisterBooleanPref(

389 prefs::kPowerAllowScreenWakeLocks,	389 prefs::kPowerAllowScreenWakeLocks,

390 true,	390 true,

391 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);	391 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

392 registry->RegisterDoublePref(	392 registry->RegisterDoublePref(

393 prefs::kPowerPresentationIdleDelayFactor,

394 2.0,

395 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

396 registry->RegisterDoublePref(

397 prefs::kPowerPresentationScreenDimDelayFactor,	393 prefs::kPowerPresentationScreenDimDelayFactor,

398 2.0,	394 2.0,

399 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);	395 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

400 registry->RegisterDoublePref(	396 registry->RegisterDoublePref(

401 prefs::kPowerUserActivityScreenDimDelayFactor,	397 prefs::kPowerUserActivityScreenDimDelayFactor,

402 2.0,	398 2.0,

403 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);	399 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

404	400

405 registry->RegisterStringPref(	401 registry->RegisterStringPref(

406 prefs::kTermsOfServiceURL,	402 prefs::kTermsOfServiceURL,

(...skipping 601 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1008	1004

1009 input_method::AutoRepeatRate rate;	1005 input_method::AutoRepeatRate rate;

1010 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();	1006 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();

1011 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();	1007 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();

1012 DCHECK(rate.initial_delay_in_ms > 0);	1008 DCHECK(rate.initial_delay_in_ms > 0);

1013 DCHECK(rate.repeat_interval_in_ms > 0);	1009 DCHECK(rate.repeat_interval_in_ms > 0);

1014 input_method::XKeyboard::SetAutoRepeatRate(rate);	1010 input_method::XKeyboard::SetAutoRepeatRate(rate);

1015 }	1011 }

1016	1012

1017 } // namespace chromeos	1013 } // namespace chromeos

OLD	NEW