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

Side by Side Diff: chrome/common/pref_names.cc

Issue 10873085: Implement two new policies to control muting the audio I/O. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed even more comments. Created 8 years, 3 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/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 487
488 // An integer representing the state of the default apps installation process. 488 // An integer representing the state of the default apps installation process.
489 // This value is persisted in the profile's user preferences because the process 489 // This value is persisted in the profile's user preferences because the process
490 // is async, and the user may have stopped chrome in the middle. The next time 490 // is async, and the user may have stopped chrome in the middle. The next time
491 // the profile is opened, the process will continue from where it left off. 491 // the profile is opened, the process will continue from where it left off.
492 // 492 //
493 // See possible values in external_provider_impl.cc. 493 // See possible values in external_provider_impl.cc.
494 const char kDefaultAppsInstallState[] = "default_apps_install_state"; 494 const char kDefaultAppsInstallState[] = "default_apps_install_state";
495 495
496 #if defined(OS_CHROMEOS) 496 #if defined(OS_CHROMEOS)
497 // An integer pref to initially mute volume if 1. 497 // An integer pref to initially mute volume if 1. This pref is ignored if
498 // |kAudioOutputEnabled| is set to false, but its value is preserved, therefore
499 // when the policy is lifted the original mute state is restored.
498 const char kAudioMute[] = "settings.audio.mute"; 500 const char kAudioMute[] = "settings.audio.mute";
499 501
500 // TODO(derat): This is deprecated in favor of |kAudioVolumePercent|; remove it 502 // TODO(derat): This is deprecated in favor of |kAudioVolumePercent|; remove it
501 // after R20 once we've cleared old user settings: http://crbug.com/112039 503 // after R20 once we've cleared old user settings: http://crbug.com/112039
502 const char kAudioVolumeDb[] = "settings.audio.volume"; 504 const char kAudioVolumeDb[] = "settings.audio.volume";
503 505
504 // A double pref storing the user-requested volume. 506 // A double pref storing the user-requested volume.
505 const char kAudioVolumePercent[] = "settings.audio.volume_percent"; 507 const char kAudioVolumePercent[] = "settings.audio.volume_percent";
506 508
507 // A boolean pref set to true if touchpad tap-to-click is enabled. 509 // A boolean pref set to true if touchpad tap-to-click is enabled.
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 const char kDeviceLocation[] = "device_status.location"; 1763 const char kDeviceLocation[] = "device_status.location";
1762 1764
1763 // A string that is used to store first-time sync startup after once sync is 1765 // A string that is used to store first-time sync startup after once sync is
1764 // disabled. This will be refreshed every sign-in. 1766 // disabled. This will be refreshed every sign-in.
1765 const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token"; 1767 const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token";
1766 1768
1767 // A pref holding the value of the policy used to disable mounting of external 1769 // A pref holding the value of the policy used to disable mounting of external
1768 // storage for the user. 1770 // storage for the user.
1769 const char kExternalStorageDisabled[] = "hardware.external_storage_disabled"; 1771 const char kExternalStorageDisabled[] = "hardware.external_storage_disabled";
1770 1772
1773 // A pref holding the value of the policy used to disable playing audio on
1774 // ChromeOS devices. This pref supersedes |kAudioMute| but does not overwrite
Mattias Nissler (ping if slow) 2012/08/30 11:51:26 nit: It doesn't supersede but rather override the
pastarmovj 2012/08/31 07:28:24 Done.
1775 // it, therefore when the policy is lifted the original mute state is restored.
1776 const char kAudioOutputEnabled[] = "hardware.audio_output_enabled";
1777
1778 // A pref holding the value of the policy used to disable capturing audio on
1779 // ChromeOS devices.
1780 const char kAudioCaptureEnabled[] = "hardware.audio_capture_enabled";
1781
1771 // A dictionary that maps usernames to wallpaper properties. 1782 // A dictionary that maps usernames to wallpaper properties.
1772 const char kUsersWallpaperInfo[] = "user_wallpaper_info"; 1783 const char kUsersWallpaperInfo[] = "user_wallpaper_info";
1773 #endif 1784 #endif
1774 1785
1775 // Whether there is a Flash version installed that supports clearing LSO data. 1786 // Whether there is a Flash version installed that supports clearing LSO data.
1776 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled"; 1787 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled";
1777 1788
1778 // Whether we should show Pepper Flash-specific settings. 1789 // Whether we should show Pepper Flash-specific settings.
1779 const char kPepperFlashSettingsEnabled[] = 1790 const char kPepperFlashSettingsEnabled[] =
1780 "browser.pepper_flash_settings_enabled"; 1791 "browser.pepper_flash_settings_enabled";
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1991 2002
1992 // Counts how many more times the 'profile on a network share' warning should be 2003 // Counts how many more times the 'profile on a network share' warning should be
1993 // shown to the user before the next silence period. 2004 // shown to the user before the next silence period.
1994 const char kNetworkProfileWarningsLeft[] = "network_profile.warnings_left"; 2005 const char kNetworkProfileWarningsLeft[] = "network_profile.warnings_left";
1995 // Tracks the time of the last shown warning. Used to reset 2006 // Tracks the time of the last shown warning. Used to reset
1996 // |network_profile.warnings_left| after a silence period. 2007 // |network_profile.warnings_left| after a silence period.
1997 const char kNetworkProfileLastWarningTime[] = 2008 const char kNetworkProfileLastWarningTime[] =
1998 "network_profile.last_warning_time"; 2009 "network_profile.last_warning_time";
1999 2010
2000 } // namespace prefs 2011 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698