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

Side by Side Diff: components/content_settings/core/common/pref_names.cc

Issue 965103004: Stop using the MEDIASTREAM content setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Migration code added. Created 5 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/content_settings/core/common/pref_names.h" 5 #include "components/content_settings/core/common/pref_names.h"
6 6
7 namespace prefs { 7 namespace prefs {
8 8
9 // Version of the pattern format used to define content settings. 9 // Version of the pattern format used to define content settings.
10 const char kContentSettingsVersion[] = "profile.content_settings.pref_version"; 10 const char kContentSettingsVersion[] = "profile.content_settings.pref_version";
(...skipping 10 matching lines...) Expand all
21 "content_settings_window.last_tab_index"; 21 "content_settings_window.last_tab_index";
22 22
23 // Dictionary of content settings applied to all hosts by default. 23 // Dictionary of content settings applied to all hosts by default.
24 const char kDefaultContentSettings[] = "profile.default_content_settings"; 24 const char kDefaultContentSettings[] = "profile.default_content_settings";
25 25
26 // Dictionary of content settings that can globally disallow all hosts by 26 // Dictionary of content settings that can globally disallow all hosts by
27 // default. If a value is set, it means the setting is globally disallowed. 27 // default. If a value is set, it means the setting is globally disallowed.
28 // If a value is not set, it means the setting is allowed. 28 // If a value is not set, it means the setting is allowed.
29 const char kOverrideContentSettings[] = "profile.override_content_settings"; 29 const char kOverrideContentSettings[] = "profile.override_content_settings";
30 30
31 // Boolean indicating whether the media stream default setting had been
32 // migrated into two separate microphone and camera settings.
33 const char kMigratedDefaultMediaStreamSetting[] =
34 "profile.migrated_default_content_settings.media_stream";
35
31 // Preferences that are exclusively used to store managed values for default 36 // Preferences that are exclusively used to store managed values for default
32 // content settings. 37 // content settings.
33 const char kManagedDefaultCookiesSetting[] = 38 const char kManagedDefaultCookiesSetting[] =
34 "profile.managed_default_content_settings.cookies"; 39 "profile.managed_default_content_settings.cookies";
35 const char kManagedDefaultImagesSetting[] = 40 const char kManagedDefaultImagesSetting[] =
36 "profile.managed_default_content_settings.images"; 41 "profile.managed_default_content_settings.images";
37 const char kManagedDefaultJavaScriptSetting[] = 42 const char kManagedDefaultJavaScriptSetting[] =
38 "profile.managed_default_content_settings.javascript"; 43 "profile.managed_default_content_settings.javascript";
39 const char kManagedDefaultPluginsSetting[] = 44 const char kManagedDefaultPluginsSetting[] =
40 "profile.managed_default_content_settings.plugins"; 45 "profile.managed_default_content_settings.plugins";
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 const char kManagedPopupsBlockedForUrls[] = 77 const char kManagedPopupsBlockedForUrls[] =
73 "profile.managed_popups_blocked_for_urls"; 78 "profile.managed_popups_blocked_for_urls";
74 const char kManagedNotificationsAllowedForUrls[] = 79 const char kManagedNotificationsAllowedForUrls[] =
75 "profile.managed_notifications_allowed_for_urls"; 80 "profile.managed_notifications_allowed_for_urls";
76 const char kManagedNotificationsBlockedForUrls[] = 81 const char kManagedNotificationsBlockedForUrls[] =
77 "profile.managed_notifications_blocked_for_urls"; 82 "profile.managed_notifications_blocked_for_urls";
78 const char kManagedAutoSelectCertificateForUrls[] = 83 const char kManagedAutoSelectCertificateForUrls[] =
79 "profile.managed_auto_select_certificate_for_urls"; 84 "profile.managed_auto_select_certificate_for_urls";
80 85
81 } // namespace prefs 86 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698