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

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

Issue 19518006: Remove the two years old code to enable the nacl plugin once if it's disabled. This was added to de… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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
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 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 // List pref containing names of plugins that are disabled by policy. 983 // List pref containing names of plugins that are disabled by policy.
984 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled"; 984 const char kPluginsDisabledPlugins[] = "plugins.plugins_disabled";
985 985
986 // List pref containing exceptions to the list of plugins disabled by policy. 986 // List pref containing exceptions to the list of plugins disabled by policy.
987 const char kPluginsDisabledPluginsExceptions[] = 987 const char kPluginsDisabledPluginsExceptions[] =
988 "plugins.plugins_disabled_exceptions"; 988 "plugins.plugins_disabled_exceptions";
989 989
990 // List pref containing names of plugins that are enabled by policy. 990 // List pref containing names of plugins that are enabled by policy.
991 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled"; 991 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled";
992 992
993 // When first shipped, the nacl plugin will be disabled by default. When we
994 // enable it by default, we'll want to do so only once.
995 const char kPluginsEnabledNaCl[] = "plugins.enabled_nacl";
996
997 // When bundled NPAPI Flash is removed, if at that point it is enabled while 993 // When bundled NPAPI Flash is removed, if at that point it is enabled while
998 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will 994 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will
999 // want to do so only once. 995 // want to do so only once.
1000 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash"; 996 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash";
1001 997
1002 // In the early stage of component-updated PPAPI Flash, we did field trials in 998 // In the early stage of component-updated PPAPI Flash, we did field trials in
1003 // which it was set to disabled by default. The corresponding settings item may 999 // which it was set to disabled by default. The corresponding settings item may
1004 // remain in some users' profiles. Currently it affects both the bundled and 1000 // remain in some users' profiles. Currently it affects both the bundled and
1005 // component-updated PPAPI Flash (since the two share the same enable/disable 1001 // component-updated PPAPI Flash (since the two share the same enable/disable
1006 // state). We want to remove this item to get those users to use PPAPI Flash. 1002 // state). We want to remove this item to get those users to use PPAPI Flash.
(...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after
2497 2493
2498 // How often the bubble has been shown. 2494 // How often the bubble has been shown.
2499 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown"; 2495 extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown";
2500 2496
2501 // A string pref for storing the salt used to compute the pepper device ID. 2497 // A string pref for storing the salt used to compute the pepper device ID.
2502 const char kDRMSalt[] = "settings.privacy.drm_salt"; 2498 const char kDRMSalt[] = "settings.privacy.drm_salt";
2503 // A boolean pref that enables the (private) pepper GetDeviceID() call. 2499 // A boolean pref that enables the (private) pepper GetDeviceID() call.
2504 const char kEnableDRM[] = "settings.privacy.drm_enabled"; 2500 const char kEnableDRM[] = "settings.privacy.drm_enabled";
2505 2501
2506 } // namespace prefs 2502 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698