Disable Win32k renderer lockdown if DirectWrite is disabled.

chrome/browser/ui/startup/bad_flags_prompt.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/switch_utils.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/simple_alert_infobar_delegate.h"
 #include "components/invalidation/invalidation_switches.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "components/translate/core/common/translate_switches.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/switches.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if defined(OS_WIN)

[jam, 2015/01/22 17:00:15]

nit: here and in other places, you don't need the ifdef. just include it for all
platforms

+#include "ui/gfx/switches.h"
+#endif
+
 namespace chrome {
 
 void ShowBadFlagsPrompt(Browser* browser) {
   content::WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return;
 
   // Unsupported flags for which to display a warning that "stability and
-  // security will suffer".
+  // security will suffer".  In reverse order of severity - most serious
+  // switches should be nearer the top.
   static const char* kBadFlags[] = {
     // These flags disable sandbox-related security.
+    switches::kNoSandbox,
     switches::kDisableGpuSandbox,
     switches::kDisableSeccompFilterSandbox,
     switches::kDisableSetuidSandbox,
     switches::kDisableWebSecurity,
 #if !defined(DISABLE_NACL)
     switches::kNaClDangerousNoSandboxNonSfi,
 #endif
-    switches::kNoSandbox,
     switches::kSingleProcess,
 
     // These flags disable or undermine the Same Origin Policy.
     switches::kTrustedSpdyProxy,
     translate::switches::kTranslateSecurityOrigin,
 
     // These flags undermine HTTPS / connection security.
 #if defined(ENABLE_WEBRTC)
     switches::kDisableWebRtcEncryption,
 #endif
@@ skipping 10 matching lines @@
     extensions::switches::kExtensionsOnChromeURLs,
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
     // Speech dispatcher is buggy, it can crash and it can make Chrome freeze.
     // http://crbug.com/327295
     switches::kEnableSpeechDispatcher,
 #endif
     NULL
   };
 
+  std::string warning_switch;
+
+  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+
+#if defined(OS_WIN)
+  if (switches::IsWin32kRendererLockdownEnabled(true) &&
+      cmd_line->HasSwitch(switches::kDisableDirectWrite)) {
+    warning_switch = switches::kDisableDirectWrite;
+  }
+#endif
+
   for (const char** flag = kBadFlags; *flag; ++flag) {
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(*flag)) {
-      SimpleAlertInfoBarDelegate::Create(
-          InfoBarService::FromWebContents(web_contents),
-          infobars::InfoBarDelegate::kNoIconID,
-          l10n_util::GetStringFUTF16(IDS_BAD_FLAGS_WARNING_MESSAGE,
-                                     base::UTF8ToUTF16(
-                                         std::string("--") + *flag)),
-          false);
-      return;
+    if (cmd_line->HasSwitch(*flag)) {
+      warning_switch = *flag;
+      break;
     }
   }
+
+  if (warning_switch.empty())
+    return;
+
+  SimpleAlertInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents),
+      infobars::InfoBarDelegate::kNoIconID,
+      l10n_util::GetStringFUTF16(
+          IDS_BAD_FLAGS_WARNING_MESSAGE,
+          base::UTF8ToUTF16(std::string("--") + warning_switch)),
+      false);
 }
 
 void MaybeShowInvalidUserDataDirWarningDialog() {
   const base::FilePath& user_data_dir = GetInvalidSpecifiedUserDataDir();
   if (user_data_dir.empty())
     return;
 
   startup_metric_utils::SetNonBrowserUIDisplayed();
 
   // Ensure the ResourceBundle is initialized for string resource access.
@@ skipping 15 matching lines @@
                                  user_data_dir.LossyDisplayName());
 
   if (cleanup_resource_bundle)
     ResourceBundle::CleanupSharedInstance();
 
   // More complex dialogs cannot be shown before the earliest calls here.
   ShowMessageBox(NULL, title, message, chrome::MESSAGE_BOX_TYPE_WARNING);
 }
 
 }  // namespace chrome