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

Side by Side Diff: chrome/common/pref_names.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
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 const char kPowerLidClosedAction[] = "power.lid_closed_action"; 865 const char kPowerLidClosedAction[] = "power.lid_closed_action";
866 866
867 // Should audio and video activity be used to disable the above delays? 867 // Should audio and video activity be used to disable the above delays?
868 const char kPowerUseAudioActivity[] = "power.use_audio_activity"; 868 const char kPowerUseAudioActivity[] = "power.use_audio_activity";
869 const char kPowerUseVideoActivity[] = "power.use_video_activity"; 869 const char kPowerUseVideoActivity[] = "power.use_video_activity";
870 870
871 // Should extensions be able to use the chrome.power API to override 871 // Should extensions be able to use the chrome.power API to override
872 // screen-related power management (including locking)? 872 // screen-related power management (including locking)?
873 const char kPowerAllowScreenWakeLocks[] = "power.allow_screen_wake_locks"; 873 const char kPowerAllowScreenWakeLocks[] = "power.allow_screen_wake_locks";
874 874
875 // DEPRECATED: This is replaced by kPowerPresentationScreenDimDelayFactor
876 // and has no effect.
877 const char kPowerPresentationIdleDelayFactor[] =
878 "power.presentation_idle_delay_factor";
879
880 // Amount by which the screen-dim delay should be scaled while the system 875 // Amount by which the screen-dim delay should be scaled while the system
881 // is in presentation mode. Values are limited to a minimum of 1.0. 876 // is in presentation mode. Values are limited to a minimum of 1.0.
882 const char kPowerPresentationScreenDimDelayFactor[] = 877 const char kPowerPresentationScreenDimDelayFactor[] =
883 "power.presentation_screen_dim_delay_factor"; 878 "power.presentation_screen_dim_delay_factor";
884 879
885 // Amount by which the screen-dim delay should be scaled when user activity is 880 // Amount by which the screen-dim delay should be scaled when user activity is
886 // observed while the screen is dimmed or soon after the screen has been turned 881 // observed while the screen is dimmed or soon after the screen has been turned
887 // off. Values are limited to a minimum of 1.0. 882 // off. Values are limited to a minimum of 1.0.
888 const char kPowerUserActivityScreenDimDelayFactor[] = 883 const char kPowerUserActivityScreenDimDelayFactor[] =
889 "power.user_activity_screen_dim_delay_factor"; 884 "power.user_activity_screen_dim_delay_factor";
(...skipping 1612 matching lines...) Expand 10 before | Expand all | Expand 10 after
2502 2497
2503 // How often the bubble has been shown. 2498 // How often the bubble has been shown.
2504 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown"; 2499 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown";
2505 2500
2506 // A string pref for storing the salt used to compute the pepper device ID. 2501 // A string pref for storing the salt used to compute the pepper device ID.
2507 const char kDRMSalt[] = "settings.privacy.drm_salt"; 2502 const char kDRMSalt[] = "settings.privacy.drm_salt";
2508 // A boolean pref that enables the (private) pepper GetDeviceID() call. 2503 // A boolean pref that enables the (private) pepper GetDeviceID() call.
2509 const char kEnableDRM[] = "settings.privacy.drm_enabled"; 2504 const char kEnableDRM[] = "settings.privacy.drm_enabled";
2510 2505
2511 } // namespace prefs 2506 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698