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

Unified Diff: content/common/content_switches_internal.cc

Issue 1133243003: Remove Win32k fieldtrial, flag and switches, and make default enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo Created 5 years, 7 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 | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('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 07d064e98eee7876b8839608bf515eba152fcff8..c13396ea3cac087b248c49d79ce8ad0b3e7ef6cc 100644
--- a/content/common/content_switches_internal.cc
+++ b/content/common/content_switches_internal.cc
@@ -50,8 +50,6 @@ void DisableWin32kRendererLockdown() {
}
bool IsWin32kRendererLockdownEnabled() {
- const std::string group_name =
- base::FieldTrialList::FindFullName("Win32kLockdown");
if (g_win32k_renderer_lockdown_disabled)
return false;
if (base::win::GetVersion() < base::win::VERSION_WIN8)
@@ -59,12 +57,9 @@ bool IsWin32kRendererLockdownEnabled() {
if (!gfx::win::ShouldUseDirectWrite())
return false;
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
- if (cmd_line->HasSwitch(switches::kEnableWin32kRendererLockDown))
- return true;
if (cmd_line->HasSwitch(switches::kDisableWin32kRendererLockDown))
return false;
- // Default.
- return group_name != "Disabled";
+ return true;
}
#endif
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698