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

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

Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed sky's comment and replaced "Do not allow any site to" with "Do not allow sites to" Created 8 years, 5 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/functional/policy_test_cases.py » ('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 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 1818 matching lines...) Expand 10 before | Expand all | Expand 10 after
1829 const char kManagedDefaultJavaScriptSetting[] = 1829 const char kManagedDefaultJavaScriptSetting[] =
1830 "profile.managed_default_content_settings.javascript"; 1830 "profile.managed_default_content_settings.javascript";
1831 const char kManagedDefaultPluginsSetting[] = 1831 const char kManagedDefaultPluginsSetting[] =
1832 "profile.managed_default_content_settings.plugins"; 1832 "profile.managed_default_content_settings.plugins";
1833 const char kManagedDefaultPopupsSetting[] = 1833 const char kManagedDefaultPopupsSetting[] =
1834 "profile.managed_default_content_settings.popups"; 1834 "profile.managed_default_content_settings.popups";
1835 const char kManagedDefaultGeolocationSetting[] = 1835 const char kManagedDefaultGeolocationSetting[] =
1836 "profile.managed_default_content_settings.geolocation"; 1836 "profile.managed_default_content_settings.geolocation";
1837 const char kManagedDefaultNotificationsSetting[] = 1837 const char kManagedDefaultNotificationsSetting[] =
1838 "profile.managed_default_content_settings.notifications"; 1838 "profile.managed_default_content_settings.notifications";
1839 const char kManagedDefaultMediaStreamSetting[] =
1840 "profile.managed_default_content_settings.media_stream";
1839 1841
1840 // Preferences that are exclusively used to store managed 1842 // Preferences that are exclusively used to store managed
1841 // content settings patterns. 1843 // content settings patterns.
1842 const char kManagedCookiesAllowedForUrls[] = 1844 const char kManagedCookiesAllowedForUrls[] =
1843 "profile.managed_cookies_allowed_for_urls"; 1845 "profile.managed_cookies_allowed_for_urls";
1844 const char kManagedCookiesBlockedForUrls[] = 1846 const char kManagedCookiesBlockedForUrls[] =
1845 "profile.managed_cookies_blocked_for_urls"; 1847 "profile.managed_cookies_blocked_for_urls";
1846 const char kManagedCookiesSessionOnlyForUrls[] = 1848 const char kManagedCookiesSessionOnlyForUrls[] =
1847 "profile.managed_cookies_sessiononly_for_urls"; 1849 "profile.managed_cookies_sessiononly_for_urls";
1848 const char kManagedImagesAllowedForUrls[] = 1850 const char kManagedImagesAllowedForUrls[] =
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1966 const char kNetworkProfileLastWarningTime[] = 1968 const char kNetworkProfileLastWarningTime[] =
1967 "network_profile.last_warning_time"; 1969 "network_profile.last_warning_time";
1968 1970
1969 #if defined(OS_MACOSX) 1971 #if defined(OS_MACOSX)
1970 // A timestamp of when the obsolete OS infobar was last shown to a user on 10.5. 1972 // A timestamp of when the obsolete OS infobar was last shown to a user on 10.5.
1971 const char kMacLeopardObsoleteInfobarLastShown[] = 1973 const char kMacLeopardObsoleteInfobarLastShown[] =
1972 "mac_105_obsolete_infobar_last_shown"; 1974 "mac_105_obsolete_infobar_last_shown";
1973 #endif // defined(OS_MACOSX) 1975 #endif // defined(OS_MACOSX)
1974 1976
1975 } // namespace prefs 1977 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/test/functional/policy_test_cases.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698