Use UMA_HISTOGRAM_ENUMERATION instead of UMA_HISTOGRAM_BOOLEAN

chrome/browser/ui/webui/ntp/new_tab_page_handler.cc

 // Copyright (c) 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/webui/ntp/new_tab_page_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/web_resource/notification_promo.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-static const char kDefaultPageTypeHistogram[] =
-    "NewTabPage.DefaultPageType";
+namespace {
+
+const char kDefaultPageTypeHistogram[] = "NewTabPage.DefaultPageType";
+
+enum PromoAction {
+  PROMO_CLOSED,
+  PROMO_VIEWED,

[Dan Beam, 2012/10/20 00:50:19]

nit: you probably want PROMO_VIEWED first in the histogram, IMO, as it'll be
easier to visually separate it as your baseline metric.

[achuithb, 2012/10/20 18:30:42]

Good suggestion! Done.

+  PROMO_LINK_CLICKED,
+  PROMO_ACTION_MAX,
+};
+
+}  // namespace
 
 NewTabPageHandler::NewTabPageHandler() : page_switch_count_(0) {
 }
 
 NewTabPageHandler::~NewTabPageHandler() {
   HISTOGRAM_COUNTS_100("NewTabPage.SingleSessionPageSwitches",
                        page_switch_count_);
 }
 
 void NewTabPageHandler::RegisterMessages() {
@@ skipping 12 matching lines @@
                                    kDefaultAppsTrialName),
         shown_page_type, kHistogramEnumerationMax);
   }
 
   web_ui()->RegisterMessageCallback("notificationPromoClosed",
       base::Bind(&NewTabPageHandler::HandleNotificationPromoClosed,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("notificationPromoViewed",
       base::Bind(&NewTabPageHandler::HandleNotificationPromoViewed,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("notificationPromoLinkClicked",
+      base::Bind(&NewTabPageHandler::HandleNotificationPromoLinkClicked,
+                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("bubblePromoClosed",
       base::Bind(&NewTabPageHandler::HandleBubblePromoClosed,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("bubblePromoViewed",
       base::Bind(&NewTabPageHandler::HandleBubblePromoViewed,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("bubblePromoLinkClicked",
       base::Bind(&NewTabPageHandler::HandleBubblePromoLinkClicked,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("pageSelected",
       base::Bind(&NewTabPageHandler::HandlePageSelected,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("logTimeToClick",
       base::Bind(&NewTabPageHandler::HandleLogTimeToClick,
                  base::Unretained(this)));
 }
 
 void NewTabPageHandler::HandleNotificationPromoClosed(const ListValue* args) {
-  UMA_HISTOGRAM_BOOLEAN("NewTabPage.Promo.Notification.Closed", true);
+  UMA_HISTOGRAM_ENUMERATION("NewTabPage.Promo.Notification",
+                            PROMO_CLOSED, PROMO_ACTION_MAX);
   NotificationPromo::HandleClosed(Profile::FromWebUI(web_ui()),
                                   NotificationPromo::NTP_NOTIFICATION_PROMO);
   Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED);
 }
 
 void NewTabPageHandler::HandleNotificationPromoViewed(const ListValue* args) {
-  UMA_HISTOGRAM_BOOLEAN("NewTabPage.Promo.Notification.Viewed", true);
+  UMA_HISTOGRAM_ENUMERATION("NewTabPage.Promo.Notification",
+                            PROMO_VIEWED, PROMO_ACTION_MAX);
   if (NotificationPromo::HandleViewed(Profile::FromWebUI(web_ui()),
           NotificationPromo::NTP_NOTIFICATION_PROMO)) {
     Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED);
   }
 }
 
+void NewTabPageHandler::HandleNotificationPromoLinkClicked(
+    const ListValue* args) {
+  DVLOG(1) << "HandleNotificationPromoLinkClicked";
+  UMA_HISTOGRAM_ENUMERATION("NewTabPage.Promo.Notification",
+                            PROMO_LINK_CLICKED, PROMO_ACTION_MAX);
+}
+
 void NewTabPageHandler::HandleBubblePromoClosed(const ListValue* args) {
-  UMA_HISTOGRAM_BOOLEAN("NewTabPage.Promo.Bubble.Closed", true);
+  UMA_HISTOGRAM_ENUMERATION("NewTabPage.Promo.Bubble",
+                            PROMO_CLOSED, PROMO_ACTION_MAX);
   NotificationPromo::HandleClosed(Profile::FromWebUI(web_ui()),
                                   NotificationPromo::NTP_BUBBLE_PROMO);
   Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED);
 }
 
 void NewTabPageHandler::HandleBubblePromoViewed(const ListValue* args) {
-  UMA_HISTOGRAM_BOOLEAN("NewTabPage.Promo.Bubble.Viewed", true);
+  UMA_HISTOGRAM_ENUMERATION("NewTabPage.Promo.Bubble",
+                            PROMO_VIEWED, PROMO_ACTION_MAX);
   if (NotificationPromo::HandleViewed(Profile::FromWebUI(web_ui()),
                                       NotificationPromo::NTP_BUBBLE_PROMO)) {
     Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED);
   }
 }
 
 void NewTabPageHandler::HandleBubblePromoLinkClicked(const ListValue* args) {
   DVLOG(1) << "HandleBubblePromoLinkClicked";
-  UMA_HISTOGRAM_BOOLEAN("NewTabPage.Promo.Bubble.LinkClicked", true);
+  UMA_HISTOGRAM_ENUMERATION("NewTabPage.Promo.Bubble",
+                            PROMO_LINK_CLICKED, PROMO_ACTION_MAX);
 }
 
 void NewTabPageHandler::HandlePageSelected(const ListValue* args) {
   page_switch_count_++;
 
   double page_id_double;
   CHECK(args->GetDouble(0, &page_id_double));
   int page_id = static_cast<int>(page_id_double);
 
   double index_double;
@@ skipping 71 matching lines @@
   values->SetInteger("shown_page_index", shown_page & INDEX_MASK);
 }
 
 void NewTabPageHandler::Notify(chrome::NotificationType notification_type) {
   content::NotificationService* service =
       content::NotificationService::current();
   service->Notify(notification_type,
                   content::Source<NewTabPageHandler>(this),
                   content::NotificationService::NoDetails());
 }