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

Unified Diff: chrome/browser/about_flags.cc

Issue 1373843004: Added PPAPI win32k lockdown options to chrome://flags. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed actions.xml patch. Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/common/content_switches_internal.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 9450456578b1dd944383a0f2f26359cb1424f18f..17300080bc65952253c855b09e87996dedd35292 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -538,6 +538,26 @@ const Experiment::Choice kCrosRegionsModeChoices[] = {
};
#endif // defined(OS_CHROMEOS)
+#if defined(OS_WIN)
+const Experiment::Choice kPpapiWin32kLockdown[] = {
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+ switches::kEnableWin32kLockDownMimeTypes, ""},
+ {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_FLASH_ONLY,
+ switches::kEnableWin32kLockDownMimeTypes,
+ "application/x-shockwave-flash,application/futuresplash"},
+ {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_PDF_ONLY,
+ switches::kEnableWin32kLockDownMimeTypes,
+ "application/x-google-chrome-pdf,application/pdf"},
+ {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_FLASH_AND_PDF,
+ switches::kEnableWin32kLockDownMimeTypes,
+ "application/x-shockwave-flash,application/futuresplash,"
+ "application/x-google-chrome-pdf,application/pdf"},
+ {IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_ALL,
+ switches::kEnableWin32kLockDownMimeTypes, "*"},
+};
+#endif // defined(OS_WIN)
+
// RECORDING USER METRICS FOR FLAGS:
// -----------------------------------------------------------------------------
// The first line of the experiment is the internal name. If you'd like to
@@ -2073,6 +2093,12 @@ const Experiment kExperiments[] = {
kOsCrOS,
MULTI_VALUE_TYPE(kCrosRegionsModeChoices)},
#endif // OS_CHROMEOS
+#if defined(OS_WIN)
+ {"enable-ppapi-win32k-lockdown",
+ IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME,
+ IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_DESCRIPTION, kOsWin,
+ MULTI_VALUE_TYPE(kPpapiWin32kLockdown)},
+#endif // defined(OS_WIN)
// NOTE: Adding new command-line switches requires adding corresponding
// entries to enum "LoginCustomFlags" in histograms.xml. See note in
// histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/common/content_switches_internal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698