Warn by default when certain DLL conflicts exist on XP.

chrome/browser/ui/toolbar/wrench_menu_model.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/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 397 matching lines @@
   return chrome::IsCommandEnabled(browser_, command_id);
 }
 
 bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
 #if defined(OS_WIN)
   if (command_id == IDC_VIEW_INCOMPATIBILITIES) {
     EnumerateModulesModel* loaded_modules =
         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();
 #else
   if (command_id == IDC_VIEW_INCOMPATIBILITIES ||
       command_id == IDC_PIN_TO_START_SCREEN) {
     return false;
 #endif
   } else if (command_id == IDC_UPGRADE_DIALOG) {
     return UpgradeDetector::GetInstance()->notify_upgrade();
@@ skipping 41 matching lines @@
 
 // For testing.
 WrenchMenuModel::WrenchMenuModel()
     : ui::SimpleMenuModel(this),
       provider_(NULL),
       browser_(NULL),
       tab_strip_model_(NULL) {
 }
 
 void WrenchMenuModel::Build(bool is_new_menu) {
+#if defined(OS_WIN)
+  AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(

[cpu_(ooo_6.6-7.5), 2013/06/04 03:01:58]

l10n_util::GetStringUTF16( in the second line looks prettier, but whatever.

+      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()) {
     // In Win8's single window Metro mode, we only show the New Window options
     // if there isn't already a window of the requested type (incognito or not)
     // that is available.
     if (browser_->profile()->IsOffTheRecord()) {
       if (chrome::FindBrowserWithProfile(
               browser_->profile()->GetOriginalProfile(),
               browser_->host_desktop_type()) == NULL) {
@@ skipping 110 matching lines @@
       string16 num_background_pages = base::FormatNumber(
           TaskManager::GetBackgroundPageCount());
       AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16(
           IDS_VIEW_BACKGROUND_PAGES, num_background_pages));
     }
   }
 
   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().
               GetNativeImageNamed(IDR_INPUT_ALERT_MENU));
 #endif
 
   if (!is_new_menu) {
     AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, IDS_HELP_PAGE);
 
     if (browser_defaults::kShowHelpMenuItemIcon) {
@@ skipping 136 matching lines @@
             &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void WrenchMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }