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

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: add missing files 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
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 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 // List pref containing names of plugins that are disabled by policy. 916 // List pref containing names of plugins that are disabled by policy.
917 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled"; 917 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled";
918 918
919 // List pref containing exceptions to the list of plugins disabled by policy. 919 // List pref containing exceptions to the list of plugins disabled by policy.
920 const char kPluginsDisabledPluginsExceptions[] = 920 const char kPluginsDisabledPluginsExceptions[] =
921 "plugins.plugins_disabled_exceptions"; 921 "plugins.plugins_disabled_exceptions";
922 922
923 // List pref containing names of plugins that are enabled by policy. 923 // List pref containing names of plugins that are enabled by policy.
924 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled"; 924 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled";
925 925
926 // Whether NPAPI plugins are enabled.
927 const char kEnableNpapi[] = "plugins.enable_npapi";
928
926 // When bundled NPAPI Flash is removed, if at that point it is enabled while 929 // When bundled NPAPI Flash is removed, if at that point it is enabled while
927 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will 930 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will
928 // want to do so only once. 931 // want to do so only once.
929 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash"; 932 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash";
930 933
931 // In the early stage of component-updated PPAPI Flash, we did field trials in 934 // In the early stage of component-updated PPAPI Flash, we did field trials in
932 // which it was set to disabled by default. The corresponding settings item may 935 // which it was set to disabled by default. The corresponding settings item may
933 // remain in some users' profiles. Currently it affects both the bundled and 936 // remain in some users' profiles. Currently it affects both the bundled and
934 // component-updated PPAPI Flash (since the two share the same enable/disable 937 // component-updated PPAPI Flash (since the two share the same enable/disable
935 // state). We want to remove this item to get those users to use PPAPI Flash. 938 // 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
2275 // (name and a list of clients that registered the whitelist). 2278 // (name and a list of clients that registered the whitelist).
2276 const char kRegisteredSupervisedUserWhitelists[] = 2279 const char kRegisteredSupervisedUserWhitelists[] =
2277 "supervised_users.whitelists"; 2280 "supervised_users.whitelists";
2278 2281
2279 #if defined(ENABLE_EXTENSIONS) 2282 #if defined(ENABLE_EXTENSIONS)
2280 // Policy that indicates how to handle animated images. 2283 // Policy that indicates how to handle animated images.
2281 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2284 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2282 #endif 2285 #endif
2283 2286
2284 } // namespace prefs 2287 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698