Make sure we don't trigger the incompatibility badge when the flag....

chrome/browser/ui/views/toolbar_view.cc

 // Copyright (c) 2010 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/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/accessibility/browser_accessibility_state.h"
 #include "chrome/browser/background_page_tracker.h"
+#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 701 matching lines @@
 
   int id = 0;
   switch (state) {
     case views::CustomButton::BS_NORMAL: id = IDR_TOOLS;   break;
     case views::CustomButton::BS_HOT:    id = IDR_TOOLS_H; break;
     case views::CustomButton::BS_PUSHED: id = IDR_TOOLS_P; break;
     default:                             NOTREACHED();     break;
   }
   SkBitmap icon = *tp->GetBitmapNamed(id);
 
+#if defined(OS_WIN)
+  // Keep track of whether we were showing the badge before, so we don't send
+  // multiple UMA events for example when multiple Chrome windows are open.
+  static bool incompatibility_badge_showing = false;
+  // Save the old value before resetting it.
+  bool was_showing = incompatibility_badge_showing;
+  incompatibility_badge_showing = false;
+#endif
+
   bool add_badge = IsUpgradeRecommended() ||
                    ShouldShowIncompatibilityWarning() ||
                    ShouldShowBackgroundPageBadge();
   if (!add_badge)
     return icon;
 
   // Draw the chrome app menu icon onto the canvas.
   scoped_ptr<gfx::CanvasSkia> canvas(
       new gfx::CanvasSkia(icon.width(), icon.height(), false));
   canvas->DrawBitmapInt(icon, 0, 0);
 
   SkBitmap badge;
   // Only one badge can be active at any given time. The Upgrade notification
   // is deemed most important, then the temporary background page badge,
   // then the DLL conflict badge.
   if (IsUpgradeRecommended()) {
     badge = *tp->GetBitmapNamed(IDR_UPDATE_BADGE);
   } else if (ShouldShowBackgroundPageBadge()) {
     badge = *tp->GetBitmapNamed(IDR_BACKGROUND_BADGE);
   } else if (ShouldShowIncompatibilityWarning()) {
 #if defined(OS_WIN)
+    if (!was_showing)
+      UserMetrics::RecordAction(UserMetricsAction("ConflictBadge"), profile_);
     badge = *tp->GetBitmapNamed(IDR_CONFLICT_BADGE);
+    incompatibility_badge_showing = true;
 #else
     NOTREACHED();
 #endif
   } else {
     NOTREACHED();
   }
 
   canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin);
 
   return canvas->ExtractBitmap();
 }