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

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

Issue 1255943002: One-time migration of NPAPI Flash to PPAPI Flash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use correct plugin name on OS X Created 5 years, 4 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') | no next file » | 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 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 898
899 // List pref containing exceptions to the list of plugins disabled by policy. 899 // List pref containing exceptions to the list of plugins disabled by policy.
900 const char kPluginsDisabledPluginsExceptions[] = 900 const char kPluginsDisabledPluginsExceptions[] =
901 "plugins.plugins_disabled_exceptions"; 901 "plugins.plugins_disabled_exceptions";
902 902
903 // List pref containing names of plugins that are enabled by policy. 903 // List pref containing names of plugins that are enabled by policy.
904 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled"; 904 const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled";
905 905
906 // When bundled NPAPI Flash is removed, if at that point it is enabled while 906 // When bundled NPAPI Flash is removed, if at that point it is enabled while
907 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will 907 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will
908 // want to do so only once. 908 // want to do so in M45, once, for realz.
909 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash"; 909 const char kNpapiFlashMigratedToPepperFlash[] =
910 910 "plugins.npapi_flash_migrated_to_pepper_flash";
911 // In the early stage of component-updated PPAPI Flash, we did field trials in
912 // which it was set to disabled by default. The corresponding settings item may
913 // remain in some users' profiles. Currently it affects both the bundled and
914 // component-updated PPAPI Flash (since the two share the same enable/disable
915 // state). We want to remove this item to get those users to use PPAPI Flash.
916 // We will want to do so only once.
917 const char kPluginsRemovedOldComponentPepperFlashSettings[] =
918 "plugins.removed_old_component_pepper_flash_settings";
919 911
920 #if !defined(OS_ANDROID) 912 #if !defined(OS_ANDROID)
921 // Whether about:plugins is shown in the details mode or not. 913 // Whether about:plugins is shown in the details mode or not.
922 const char kPluginsShowDetails[] = "plugins.show_details"; 914 const char kPluginsShowDetails[] = "plugins.show_details";
923 #endif 915 #endif
924 916
925 // Boolean that indicates whether outdated plugins are allowed or not. 917 // Boolean that indicates whether outdated plugins are allowed or not.
926 const char kPluginsAllowOutdated[] = "plugins.allow_outdated"; 918 const char kPluginsAllowOutdated[] = "plugins.allow_outdated";
927 919
928 // Boolean that indicates whether plugins that require authorization should 920 // Boolean that indicates whether plugins that require authorization should
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after
2264 "supervised_users.whitelists"; 2256 "supervised_users.whitelists";
2265 2257
2266 #if defined(ENABLE_EXTENSIONS) 2258 #if defined(ENABLE_EXTENSIONS)
2267 // Policy that indicates how to handle animated images. 2259 // Policy that indicates how to handle animated images.
2268 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2260 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2269 #endif 2261 #endif
2270 2262
2271 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload"; 2263 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload";
2272 2264
2273 } // namespace prefs 2265 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698