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

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

Issue 1158423003: Disable NPAPI support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove enterprise policy override based on revert of 26d09db Created 5 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
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 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 // List pref containing names of plugins that are disabled by policy. 904 // List pref containing names of plugins that are disabled by policy.
905 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled"; 905 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled";
906 906
907 // List pref containing exceptions to the list of plugins disabled by policy. 907 // List pref containing exceptions to the list of plugins disabled by policy.
908 const char kPluginsDisabledPluginsExceptions[] = 908 const char kPluginsDisabledPluginsExceptions[] =
909 "plugins.plugins_disabled_exceptions"; 909 "plugins.plugins_disabled_exceptions";
910 910
911 // List pref containing names of plugins that are enabled by policy. 911 // List pref containing names of plugins that are enabled by policy.
912 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled"; 912 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled";
913 913
914 // Whether NPAPI plugins are enabled.
915 const char kEnableNpapi[] = "plugins.enable_npapi";
916
917 // When bundled NPAPI Flash is removed, if at that point it is enabled while 914 // When bundled NPAPI Flash is removed, if at that point it is enabled while
918 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will 915 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will
919 // want to do so only once. 916 // want to do so only once.
920 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash"; 917 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash";
921 918
922 // In the early stage of component-updated PPAPI Flash, we did field trials in 919 // In the early stage of component-updated PPAPI Flash, we did field trials in
923 // which it was set to disabled by default. The corresponding settings item may 920 // which it was set to disabled by default. The corresponding settings item may
924 // remain in some users' profiles. Currently it affects both the bundled and 921 // remain in some users' profiles. Currently it affects both the bundled and
925 // component-updated PPAPI Flash (since the two share the same enable/disable 922 // component-updated PPAPI Flash (since the two share the same enable/disable
926 // state). We want to remove this item to get those users to use PPAPI Flash. 923 // state). We want to remove this item to get those users to use PPAPI Flash.
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after
2272 // (name and a list of clients that registered the whitelist). 2269 // (name and a list of clients that registered the whitelist).
2273 const char kRegisteredSupervisedUserWhitelists[] = 2270 const char kRegisteredSupervisedUserWhitelists[] =
2274 "supervised_users.whitelists"; 2271 "supervised_users.whitelists";
2275 2272
2276 #if defined(ENABLE_EXTENSIONS) 2273 #if defined(ENABLE_EXTENSIONS)
2277 // Policy that indicates how to handle animated images. 2274 // Policy that indicates how to handle animated images.
2278 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2275 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2279 #endif 2276 #endif
2280 2277
2281 } // namespace prefs 2278 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698