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

chrome/browser/ui/views/conflicting_module_view_win.cc

 // Copyright (c) 2013 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/views/conflicting_module_view_win.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/layout_constants.h"
-#include "chrome/browser/win/enumerate_modules_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 21 matching lines @@
                                              const GURL& help_center_url)
     : BubbleDialogDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       browser_(browser),
       help_center_url_(help_center_url) {
   set_close_on_deactivate(false);
 
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(
       GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 
-  registrar_.Add(this, chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_ICON_CHANGE,
-                 content::NotificationService::AllSources());
+  // Register for notifications about conflicting modules.
+  EnumerateModulesModel::GetInstance()->AddObserver(this);

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

Nit: See earlier comment about whether using a ScopedObserver is cleaner or
safer

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

Done.

 }
 
 // static
 void ConflictingModuleView::MaybeShow(Browser* browser,
                                       views::View* anchor_view) {
   static bool done_checking = false;
   if (done_checking)
     return;  // Only show the bubble once per launch.
 
   EnumerateModulesModel* model = EnumerateModulesModel::GetInstance();
-  GURL url = model->GetFirstNotableConflict();
+  GURL url = model->GetConflictUrl();
   if (!url.is_valid()) {

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

Nit: See earlier comment about whether this is necessary

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

Acknowledged.

     done_checking = true;
     return;
   }
 
   // A pref that counts how often the Sideload Wipeout bubble has been shown.
   IntegerPrefMember bubble_shown;
   bubble_shown.Init(prefs::kModuleConflictBubbleShown,
                     browser->profile()->GetPrefs());
   if (bubble_shown.GetValue() >= kShowConflictingModuleBubbleMax) {
     done_checking = true;
@@ skipping 12 matching lines @@
   views::BubbleDialogDelegateView::CreateBubble(bubble_delegate);
   bubble_delegate->ShowBubble();
 
   done_checking = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ConflictingModuleView - private.
 
 ConflictingModuleView::~ConflictingModuleView() {
+  EnumerateModulesModel::GetInstance()->RemoveObserver(this);
 }
 
 void ConflictingModuleView::ShowBubble() {
   GetWidget()->Show();
 
   IntegerPrefMember bubble_shown;
   bubble_shown.Init(
       prefs::kModuleConflictBubbleShown,
       browser_->profile()->GetPrefs());
   bubble_shown.SetValue(bubble_shown.GetValue() + 1);
@@ skipping 46 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("ConflictingModule.UserSelection",
       EnumerateModulesModel::ACTION_BUBBLE_SHOWN,
       EnumerateModulesModel::ACTION_BOUNDARY);
 }
 
 void ConflictingModuleView::GetAccessibleState(
     ui::AXViewState* state) {
   state->role = ui::AX_ROLE_ALERT_DIALOG;
 }
 
-void ConflictingModuleView::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_ICON_CHANGE, type);
+void ConflictingModuleView::OnConflictsAcknowledged() {
   EnumerateModulesModel* model = EnumerateModulesModel::GetInstance();
   if (!model->ShouldShowConflictWarning())
     GetWidget()->Close();
 }