Warn by default when certain DLL conflicts exist on XP.

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index d58530a666857e10c9e928da4eae11e51b9c7f6d..73d52218b6552fa09ad5dcb178c8ed4f8f1adf48 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -415,7 +415,9 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
         EnumerateModulesModel::GetInstance();
     if (loaded_modules->confirmed_bad_modules_detected() <= 0)
       return false;
-    loaded_modules->AcknowledgeConflictNotification();
+    // We'll leave the wrench adornment on until the user clicks the link.
+    if (loaded_modules->modules_to_notify_about() <= 0)
+      loaded_modules->AcknowledgeConflictNotification();
     return true;
   } else if (command_id == IDC_PIN_TO_START_SCREEN) {
     return base::win::IsMetroProcess();
@@ -477,6 +479,16 @@ WrenchMenuModel::WrenchMenuModel()
 }
 
 void WrenchMenuModel::Build(bool is_new_menu) {
+#if defined(OS_WIN)
+  AddItem(IDC_VIEW_INCOMPATIBILITIES,
+      l10n_util::GetStringUTF16(IDS_VIEW_INCOMPATIBILITIES));
+  EnumerateModulesModel* model =
+      EnumerateModulesModel::GetInstance();
+  if (model->modules_to_notify_about() > 0 ||
+      model->confirmed_bad_modules_detected() > 0)
+    AddSeparator(ui::NORMAL_SEPARATOR);
+#endif
+
   AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
 #if defined(OS_WIN)
   if (win8::IsSingleWindowMetroMode()) {
@@ -607,9 +619,6 @@ void WrenchMenuModel::Build(bool is_new_menu) {
   if (browser_defaults::kShowUpgradeMenuItem)
     AddItem(IDC_UPGRADE_DIALOG, GetUpgradeDialogMenuItemName());
 
-  AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(
-      IDS_VIEW_INCOMPATIBILITIES));
-
 #if defined(OS_WIN)
   SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
           ui::ResourceBundle::GetSharedInstance().