[Win] Add reporting of total number of modules loaded in browser process.

chrome/browser/ui/toolbar/app_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/app_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 666 matching lines @@
   return chrome::IsCommandEnabled(browser_, command_id);
 }
 
 bool AppMenuModel::IsCommandIdVisible(int command_id) const {
   switch (command_id) {
 #if defined(OS_MACOSX)
     case kEmptyMenuItemCommand:
       return false;  // Always hidden (see CreateActionToolbarOverflowMenu).
 #endif
 #if defined(OS_WIN)
-    case IDC_VIEW_INCOMPATIBILITIES: {
-      EnumerateModulesModel* loaded_modules =
-          EnumerateModulesModel::GetInstance();
-      if (loaded_modules->confirmed_bad_modules_detected() <= 0)
-        return false;
-      // We'll leave the app menu adornment on until the user clicks the link.
-      if (loaded_modules->modules_to_notify_about() <= 0)
-        loaded_modules->AcknowledgeConflictNotification();
-      return true;
-    }
+    case IDC_VIEW_INCOMPATIBILITIES:
+      return EnumerateModulesModel::GetInstance()->ShouldShowConflictWarning();
     case IDC_PIN_TO_START_SCREEN:
       return false;

[Peter Kasting, 2016/08/05 00:10:08]

Nit: Could factor IDC_PIN_TO_START_SCREEN out of the #ifdef since both
implementations are the same.  The absolute most compact way (although this is a
bit fragile, and you might not choose to do it) would be:

    case IDC_VIEW_INCOMPATIBILITIES:
#if defined(OS_WIN)
      return EnumerateModulesModel::GetInstance()->ShouldShowConflictWarning();
#endif
    case IDC_PIN_TO_START_SCREEN:
      return false;

If that makes you uneasy, the simpler route would be to just explicitly do:

    case IDC_VIEW_INCOMPATIBILITIES:
#if defined(OS_WIN)
      return EnumerateModulesModel::GetInstance()->ShouldShowConflictWarning();
#else
      return false;
#endif
    case IDC_PIN_TO_START_SCREEN:
      return false;

[chrisha, 2016/08/12 19:04:40]

Thanks for the suggestion. Went the less fragile route.

 #else
     case IDC_VIEW_INCOMPATIBILITIES:
     case IDC_PIN_TO_START_SCREEN:
       return false;
 #endif
     case IDC_UPGRADE_DIALOG:
       return browser_defaults::kShowUpgradeMenuItem &&
           UpgradeDetector::GetInstance()->notify_upgrade();
 #if !defined(OS_LINUX) || defined(USE_AURA)
     case IDC_BOOKMARK_PAGE:
@@ skipping 225 matching lines @@
                        browser_->tab_strip_model()->GetActiveWebContents())
                        ->GetZoomPercent();
   }
   zoom_label_ = base::FormatPercent(zoom_percent);
 }
 
 void AppMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }