Add NewTabPage.MostVisited and .SuggestionsImpression on Android

components/ntp_tiles/most_visited_sites.cc

 // Copyright 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 "components/ntp_tiles/most_visited_sites.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 235 matching lines @@
   UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.IconsGray",
                               counts_per_type[ICON_DEFAULT]);
 }
 
 void MostVisitedSites::RecordOpenedMostVisitedItem(int index, int tile_type) {
   // TODO(treib): |current_suggestions_| could be updated before this function
   // is called, leading to DCHECKs and/or memory corruption.  Adjust this
   // function to work with asynchronous UI.
   DCHECK_GE(index, 0);
   DCHECK_LT(index, static_cast<int>(current_suggestions_.size()));
+
+  UMA_HISTOGRAM_ENUMERATION("NewTabPage.MostVisited", index, num_sites_);
+
   std::string histogram = base::StringPrintf(
       "NewTabPage.MostVisited.%s",
       GetSourceHistogramName(current_suggestions_[index].source).c_str());
   LogHistogramEvent(histogram, index, num_sites_);
 
   histogram = base::StringPrintf(
       "NewTabPage.TileTypeClicked.%s",
       GetSourceHistogramName(current_suggestions_[index].source).c_str());
   LogHistogramEvent(histogram, tile_type, NUM_TILE_TYPES);
 }
@@ skipping 229 matching lines @@
     source_list.AppendBoolean(suggestion.source != POPULAR);
   }
   prefs_->Set(ntp_tiles::prefs::kNTPSuggestionsIsPersonal, source_list);
   prefs_->Set(ntp_tiles::prefs::kNTPSuggestionsURL, url_list);
 }
 
 void MostVisitedSites::NotifyMostVisitedURLsObserver() {
   if (received_most_visited_sites_ && received_popular_sites_ &&
       !recorded_uma_) {
     RecordImpressionUMAMetrics();
-    UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.NumberOfTiles",
-                                current_suggestions_.size());
     recorded_uma_ = true;
   }
 
   if (!observer_)
     return;
 
   observer_->OnMostVisitedURLsAvailable(current_suggestions_);
 }
 
 void MostVisitedSites::OnPopularSitesAvailable(bool success) {
   received_popular_sites_ = true;
 
   if (!success) {
     LOG(WARNING) << "Download of popular sites failed";
     return;
   }
 
   // Pass the popular sites to the observer. This will cause it to fetch any
   // missing icons, but will *not* cause it to display the popular sites.
   observer_->OnPopularURLsAvailable(popular_sites_->sites());
 
   // Re-build the suggestions list. Once done, this will notify the observer.
   BuildCurrentSuggestions();
 }
 
 void MostVisitedSites::RecordImpressionUMAMetrics() {
+  UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.NumberOfTiles",
+                              current_suggestions_.size());
+
   for (size_t i = 0; i < current_suggestions_.size(); i++) {
+    UMA_HISTOGRAM_ENUMERATION(
+        "NewTabPage.SuggestionsImpression", static_cast<int>(i), num_sites_);
+
     std::string histogram = base::StringPrintf(
         "NewTabPage.SuggestionsImpression.%s",
         GetSourceHistogramName(current_suggestions_[i].source).c_str());
     LogHistogramEvent(histogram, static_cast<int>(i), num_sites_);
   }
 }
 
 void MostVisitedSites::TopSitesLoaded(TopSites* top_sites) {}
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == TOP_SITES) {
     // The displayed suggestions are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 }  // namespace ntp_tiles