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

chrome/browser/ui/toolbar/app_menu_icon_controller.cc

 // Copyright 2014 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_icon_controller.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/upgrade_detector.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
-#include "chrome/browser/enumerate_modules_model_win.h"
 #endif
 
 namespace {
 
 // Maps an upgrade level to a severity level.
 AppMenuIconPainter::Severity SeverityFromUpgradeLevel(
     UpgradeDetector::UpgradeNotificationAnnoyanceLevel level) {
   switch (level) {
     case UpgradeDetector::UPGRADE_ANNOYANCE_NONE:
       return AppMenuIconPainter::SEVERITY_NONE;
@@ skipping 32 matching lines @@
   // should not be displayed in the app menu.
   return false;
 #else
   return UpgradeDetector::GetInstance()->notify_upgrade();
 #endif
 }
 
 // Returns true if we should show the warning for incompatible software.
 bool ShouldShowIncompatibilityWarning() {
 #if defined(OS_WIN)
-  EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
-  loaded_modules->MaybePostScanningTask();
-  return loaded_modules->ShouldShowConflictWarning();
+  return EnumerateModulesModel::GetInstance()->ShouldShowConflictWarning();
 #else
   return false;
 #endif
 }
 
 }  // namespace
 
 AppMenuIconController::AppMenuIconController(Profile* profile,
                                              Delegate* delegate)
     : profile_(profile), delegate_(delegate) {
   DCHECK(profile_);
   DCHECK(delegate_);
 
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
                  content::Source<Profile>(profile_));
 
 #if defined(OS_WIN)
-  registrar_.Add(this, chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_ICON_CHANGE,
-                 content::NotificationService::AllSources());
+  auto modules = EnumerateModulesModel::GetInstance();
+  modules->AddObserver(this);
+  modules->MaybePostScanningTask();
 #endif
 }
 
-AppMenuIconController::~AppMenuIconController() {}
+AppMenuIconController::~AppMenuIconController() {
+#if defined(OS_WIN)
+  EnumerateModulesModel::GetInstance()->RemoveObserver(this);
+#endif
+}
 
 void AppMenuIconController::UpdateDelegate() {
   if (ShouldShowUpgradeRecommended()) {
     UpgradeDetector::UpgradeNotificationAnnoyanceLevel level =
         UpgradeDetector::GetInstance()->upgrade_notification_stage();
     delegate_->UpdateSeverity(IconType::UPGRADE_NOTIFICATION,
                               SeverityFromUpgradeLevel(level),
                               ShouldAnimateUpgradeLevel(level));
     return;
   }
 
   if (ShouldShowIncompatibilityWarning()) {
     delegate_->UpdateSeverity(IconType::INCOMPATIBILITY_WARNING,
                               AppMenuIconPainter::SEVERITY_MEDIUM, true);
     return;
   }
 
   if (GlobalErrorServiceFactory::GetForProfile(profile_)
           ->GetHighestSeverityGlobalErrorWithAppMenuItem()) {
     // If you change the severity here, make sure to also change the menu icon
     // and the bubble icon.
     delegate_->UpdateSeverity(IconType::GLOBAL_ERROR,
                               AppMenuIconPainter::SEVERITY_MEDIUM, true);
     return;
   }
 
   delegate_->UpdateSeverity(IconType::NONE,
                             AppMenuIconPainter::SEVERITY_NONE, true);
 }
+
+#if defined(OS_WIN)
+void AppMenuIconController::OnScanCompleted(bool limited_mode) {
+  if (!limited_mode)
+    UpdateDelegate();
+}
+
+void AppMenuIconController::OnConflictsAcknowledged() {
+  UpdateDelegate();
+}
+#endif
+
 void AppMenuIconController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   UpdateDelegate();
 }