Warn by default when certain DLL conflicts exist on XP.

chrome/browser/ui/views/toolbar_view.cc

 // Copyright 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/views/toolbar_view.h"
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
@@ skipping 42 matching lines @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/views/controls/button/button_dropdown.h"
 #include "ui/views/controls/menu/menu_listener.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
+#include "base/win/windows_version.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
+#include "chrome/browser/ui/views/extensions/conflicting_module_view_win.h"
 #if !defined(USE_AURA)
 #include "chrome/browser/ui/views/app_menu_button_win.h"
 #endif
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/native_theme/native_theme_aura.h"
 #endif
@@ skipping 93 matching lines @@
 
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                  content::NotificationService::AllSources());
   if (OutdatedUpgradeBubbleView::IsAvailable()) {
     registrar_.Add(this, chrome::NOTIFICATION_OUTDATED_INSTALL,
                    content::NotificationService::AllSources());
   }
 #if defined(OS_WIN)
   registrar_.Add(this, chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED,
                  content::NotificationService::AllSources());
+  // if (base::win::GetVersion() == base::win::VERSION_XP) {  // for checkin.
+  if (base::win::GetVersion() == base::win::VERSION_WIN7) {   // for testing.
+    registrar_.Add(this, chrome::NOTIFICATION_MODULE_LIST_ENUMERATED,
+                   content::NotificationService::AllSources());
+  }
 #endif
   registrar_.Add(this,
                  chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
                  content::Source<Profile>(browser_->profile()));
 }
 
 ToolbarView::~ToolbarView() {
   // NOTE: Don't remove the command observers here.  This object gets destroyed
@@ skipping 266 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, content::NotificationObserver implementation:
 
 void ToolbarView::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_UPGRADE_RECOMMENDED:
     case chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE:
     case chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED:
+    case chrome::NOTIFICATION_MODULE_LIST_ENUMERATED:
       UpdateAppMenuState();
       break;
     case chrome::NOTIFICATION_OUTDATED_INSTALL:
       ShowOutdatedInstallNotification();
       break;
 #if defined(OS_WIN)
     case chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED:
       ShowCriticalNotification();
       break;
 #endif
@@ skipping 307 matching lines @@
 
   if (ShouldShowUpgradeRecommended()) {
     UpgradeDetector::UpgradeNotificationAnnoyanceLevel level =
         UpgradeDetector::GetInstance()->upgrade_notification_stage();
     app_menu_->SetSeverity(WrenchIconPainter::SeverityFromUpgradeLevel(level),
                            WrenchIconPainter::ShouldAnimateUpgradeLevel(level));
     return;
   }
 
   if (ShouldShowIncompatibilityWarning()) {
-    if (!was_showing)
+    if (!was_showing) {
       content::RecordAction(UserMetricsAction("ConflictBadge"));
+#if defined(OS_WIN)
+      ConflictingModuleView::MaybeShow(browser_, app_menu_);
+#endif
+    }
     app_menu_->SetSeverity(WrenchIconPainter::SEVERITY_MEDIUM, true);
     incompatibility_badge_showing = true;
     return;
   }
 
   GlobalErrorService* service =
       GlobalErrorServiceFactory::GetForProfile(browser_->profile());
   GlobalError* error =
       service->GetHighestSeverityGlobalErrorWithWrenchMenuItem();
   if (error) {
     app_menu_->SetSeverity(WrenchIconPainter::GlobalErrorSeverity(), true);
     return;
   }
 
   app_menu_->SetSeverity(WrenchIconPainter::SEVERITY_NONE, true);
 }
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }