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

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

Issue 1071713004: Enable NPAPI if policy has plugin policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix GN Created 5 years, 8 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
« no previous file with comments | « chrome/common/pref_names.h ('k') | content/browser/plugin_service_impl.h » ('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 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 // List pref containing names of plugins that are disabled by policy. 925 // List pref containing names of plugins that are disabled by policy.
926 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled"; 926 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled";
927 927
928 // List pref containing exceptions to the list of plugins disabled by policy. 928 // List pref containing exceptions to the list of plugins disabled by policy.
929 const char kPluginsDisabledPluginsExceptions[] = 929 const char kPluginsDisabledPluginsExceptions[] =
930 "plugins.plugins_disabled_exceptions"; 930 "plugins.plugins_disabled_exceptions";
931 931
932 // List pref containing names of plugins that are enabled by policy. 932 // List pref containing names of plugins that are enabled by policy.
933 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled"; 933 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled";
934 934
935 // Whether NPAPI plugins are enabled.
936 const char kEnableNpapi[] = "plugins.enable_npapi";
937
935 // When bundled NPAPI Flash is removed, if at that point it is enabled while 938 // When bundled NPAPI Flash is removed, if at that point it is enabled while
936 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will 939 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will
937 // want to do so only once. 940 // want to do so only once.
938 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash"; 941 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash";
939 942
940 // In the early stage of component-updated PPAPI Flash, we did field trials in 943 // In the early stage of component-updated PPAPI Flash, we did field trials in
941 // which it was set to disabled by default. The corresponding settings item may 944 // which it was set to disabled by default. The corresponding settings item may
942 // remain in some users' profiles. Currently it affects both the bundled and 945 // remain in some users' profiles. Currently it affects both the bundled and
943 // component-updated PPAPI Flash (since the two share the same enable/disable 946 // component-updated PPAPI Flash (since the two share the same enable/disable
944 // state). We want to remove this item to get those users to use PPAPI Flash. 947 // state). We want to remove this item to get those users to use PPAPI Flash.
(...skipping 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after
2284 // (name and a list of clients that registered the whitelist). 2287 // (name and a list of clients that registered the whitelist).
2285 const char kRegisteredSupervisedUserWhitelists[] = 2288 const char kRegisteredSupervisedUserWhitelists[] =
2286 "supervised_users.whitelists"; 2289 "supervised_users.whitelists";
2287 2290
2288 #if defined(ENABLE_EXTENSIONS) 2291 #if defined(ENABLE_EXTENSIONS)
2289 // Policy that indicates how to handle animated images. 2292 // Policy that indicates how to handle animated images.
2290 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2293 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2291 #endif 2294 #endif
2292 2295
2293 } // namespace prefs 2296 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | content/browser/plugin_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698