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

Unified Diff: content/common/content_switches_internal.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/browser/about_flags.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/content_switches_internal.cc
diff --git a/content/common/content_switches_internal.cc b/content/common/content_switches_internal.cc
index aa34ca1891396b26dffa3e51ee1f8253b86c3815..c97af030899a5928992b83e9ea44fab921e51dd5 100644
--- a/content/common/content_switches_internal.cc
+++ b/content/common/content_switches_internal.cc
@@ -70,11 +70,10 @@ bool IsWin32kLockdownEnabledForMimeType(const std::string& mime_type) {
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
std::string mime_types =
- cmd_line->GetSwitchValueASCII(switches::kEnableWin32kLockDownMimeTypes);
-
- if (mime_types.empty()) {
+ base::FieldTrialList::FindFullName("EnableWin32kLockDownMimeTypes");
+ if (cmd_line->HasSwitch(switches::kEnableWin32kLockDownMimeTypes)) {
mime_types =
- base::FieldTrialList::FindFullName("EnableWin32kLockDownMimeTypes");
+ cmd_line->GetSwitchValueASCII(switches::kEnableWin32kLockDownMimeTypes);
}
// Consider the value * to enable all mime types for lockdown.
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698