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

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

Issue 12388012: Ignore the disabled state of component-updated PPAPI Flash for once. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 9 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
« 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 8
9 namespace prefs { 9 namespace prefs {
10 10
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 976
977 // When first shipped, the nacl plugin will be disabled by default. When we 977 // When first shipped, the nacl plugin will be disabled by default. When we
978 // enable it by default, we'll want to do so only once. 978 // enable it by default, we'll want to do so only once.
979 const char kPluginsEnabledNaCl[] = "plugins.enabled_nacl"; 979 const char kPluginsEnabledNaCl[] = "plugins.enabled_nacl";
980 980
981 // When bundled NPAPI Flash is removed, if at that point it is enabled while 981 // When bundled NPAPI Flash is removed, if at that point it is enabled while
982 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will 982 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will
983 // want to do so only once. 983 // want to do so only once.
984 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash"; 984 const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash";
985 985
986 // In the early stage of component-updated PPAPI Flash, we did field trials in
987 // which it was set to disabled by default. The corresponding settings item may
988 // remain in some users' profiles. Currently it affects both the bundled and
989 // component-updated PPAPI Flash (since the two share the same enable/disable
990 // state). We want to remove this item to get those users to use PPAPI Flash.
991 // We will want to do so only once.
992 const char kPluginsRemovedOldComponentPepperFlashSettings[] =
993 "plugins.removed_old_component_pepper_flash_settings";
994
986 #if !defined(OS_ANDROID) 995 #if !defined(OS_ANDROID)
987 // Whether about:plugins is shown in the details mode or not. 996 // Whether about:plugins is shown in the details mode or not.
988 const char kPluginsShowDetails[] = "plugins.show_details"; 997 const char kPluginsShowDetails[] = "plugins.show_details";
989 #endif 998 #endif
990 999
991 // Boolean that indicates whether outdated plugins are allowed or not. 1000 // Boolean that indicates whether outdated plugins are allowed or not.
992 const char kPluginsAllowOutdated[] = "plugins.allow_outdated"; 1001 const char kPluginsAllowOutdated[] = "plugins.allow_outdated";
993 1002
994 // Boolean that indicates whether plugins that require authorization should 1003 // Boolean that indicates whether plugins that require authorization should
995 // be always allowed or not. 1004 // be always allowed or not.
(...skipping 1324 matching lines...) Expand 10 before | Expand all | Expand 10 after
2320 const char kRLZBrand[] = "rlz.brand"; 2329 const char kRLZBrand[] = "rlz.brand";
2321 // Whether RLZ pings are disabled. 2330 // Whether RLZ pings are disabled.
2322 const char kRLZDisabled[] = "rlz.disabled"; 2331 const char kRLZDisabled[] = "rlz.disabled";
2323 #endif 2332 #endif
2324 2333
2325 // The directory in user data dir that contains the profile to be used with the 2334 // The directory in user data dir that contains the profile to be used with the
2326 // app launcher. 2335 // app launcher.
2327 extern const char kAppListProfile[] = "app_list.profile"; 2336 extern const char kAppListProfile[] = "app_list.profile";
2328 2337
2329 } // namespace prefs 2338 } // 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