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

chrome/browser/ui/toolbar/app_menu_icon_controller.h

Index: chrome/browser/ui/toolbar/app_menu_icon_controller.h
diff --git a/chrome/browser/ui/toolbar/app_menu_icon_controller.h b/chrome/browser/ui/toolbar/app_menu_icon_controller.h
index 4d8698f08e527a1dfef48ceb7f87d07f4d263d62..05f9de6ef8fdb74c8e855288a837d6a688c14c29 100644
--- a/chrome/browser/ui/toolbar/app_menu_icon_controller.h
+++ b/chrome/browser/ui/toolbar/app_menu_icon_controller.h
@@ -12,11 +12,19 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 
+#if defined(OS_WIN)

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

Nit: Consider whether it might be cleaner to have at least the Observer class
from here defined in a not-win-specific file.  This would let you avoid all the
ifdefs in this file and at least some in the .cc file.

You may decide that it's worth keeping the ifdefs here, to emphasize that none
of this functionality is reached in non-Windows.  On the other end, you might go
all the way to making EnumerateModulesModel itself be declared in cross-platform
files, and only ever actually do anything when run on Windows, which would
remove all the ifdefs from here and the .cc file.  This would depend partly on
the degree of "black-boxing" you want for that class, and how much callers
should know about what it does and why we care about it.  It would also depend
on whether it would ever make sense conceptually to run such code on other OSes.

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

I'll stick with the existing system for now. I think it makes sense to make the
definition available across platforms if it ever becomes used across more than
one of them, and have left a comment to that effect.

+#include "chrome/browser/win/enumerate_modules_model.h"
+#endif
+
 class Profile;
 
 // AppMenuIconController encapsulates the logic for badging the app menu icon
 // as a result of various events - such as available updates, errors, etc.
-class AppMenuIconController : public content::NotificationObserver {
+class AppMenuIconController :
+#if defined(OS_WIN)
+    public EnumerateModulesModel::Observer,
+#endif
+    public content::NotificationObserver {
  public:
   enum class IconType {
     NONE,
@@ -56,6 +64,12 @@ class AppMenuIconController : public content::NotificationObserver {
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
+#if defined(OS_WIN)
+  // EnumerateModulesModel:
+  void OnScanCompleted() override;
+  void OnConflictsAcknowledged() override;
+#endif
+
   Profile* profile_;
   Delegate* delegate_;
   content::NotificationRegistrar registrar_;