[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"
@@ skipping 48 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();

[Lei Zhang, 2016/08/04 14:33:32]

auto*

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

Done.

+  modules->AddObserver(this);

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

Nit: Consider whether it would be cleaner or safer to use a ScopedObserver in
place of the manual AddObserver() and RemoveObserver() calls.

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

I'm not a huge fan of precompiler logic in initializer lists, and think it reads
cleaner this way. Would be happen to change this if we ever make the class
definition exist across OSes.

+  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() {
+  UpdateDelegate();
+}
+
+void AppMenuIconController::OnConflictsAcknowledged() {
+  UpdateDelegate();
+}
+#endif
+
 void AppMenuIconController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   UpdateDelegate();
 }