NTP: Record TileType metrics also on desktop

chrome/browser/ui/webui/ntp/ntp_user_data_logger.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 "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 80 matching lines @@
       tiles_received_time_ = time;
       break;
     case NTP_ALL_TILES_LOADED:
       EmitNtpStatistics(time);
       break;
   }
 }
 
 void NTPUserDataLogger::LogMostVisitedImpression(
     int position,
-    ntp_tiles::TileSource tile_source) {
+    ntp_tiles::TileSource tile_source,
+    ntp_tiles::TileVisualType tile_type) {
   if ((position >= kNumMostVisited) || impression_was_logged_[position]) {
     return;
   }
   impression_was_logged_[position] = true;
   impression_tile_source_[position] = tile_source;
+  impression_tile_type_[position] = tile_type;
 }
 
 void NTPUserDataLogger::LogMostVisitedNavigation(
     int position,
-    ntp_tiles::TileSource tile_source) {
-  ntp_tiles::metrics::RecordTileClick(position, tile_source,
-                                      ntp_tiles::TileVisualType::THUMBNAIL);
+    ntp_tiles::TileSource tile_source,
+    ntp_tiles::TileVisualType tile_type) {
+  ntp_tiles::metrics::RecordTileClick(position, tile_source, tile_type);
 
   // Records the action. This will be available as a time-stamped stream
   // server-side and can be used to compute time-to-long-dwell.
   base::RecordAction(base::UserMetricsAction("MostVisited_Clicked"));
 }
 
 NTPUserDataLogger::NTPUserDataLogger(content::WebContents* contents)
     : content::WebContentsObserver(contents),
       impression_tile_source_(kNumMostVisited),
+      impression_tile_type_(kNumMostVisited),
       has_emitted_(false),
       during_startup_(!AfterStartupTaskUtils::IsBrowserStartupComplete()) {
   // We record metrics about session data here because when this class typically
   // emits metrics it is too late. This session data would theoretically have
   // been used to populate the page, and we want to learn about its state when
   // the NTP is being generated.
   RecordSyncSessionMetrics(contents);
 }
 
 // content::WebContentsObserver override
@@ skipping 28 matching lines @@
   for (int i = 0; i < kNumMostVisited; i++) {
     if (!impression_was_logged_[i]) {
       break;
     }
     if (impression_tile_source_[i] ==
         ntp_tiles::TileSource::SUGGESTIONS_SERVICE) {
       has_server_side_suggestions = true;
     }
     // No URL passed since we're not interested in favicon-related Rappor
     // metrics.
-    tiles.emplace_back(impression_tile_source_[i],
-                       ntp_tiles::TileVisualType::THUMBNAIL, GURL());
+    tiles.emplace_back(impression_tile_source_[i], impression_tile_type_[i],
+                       GURL());
   }
 
   // Not interested in Rappor metrics.
   ntp_tiles::metrics::RecordPageImpression(tiles, /*rappor_service=*/nullptr);
 
   UMA_HISTOGRAM_LOAD_TIME("NewTabPage.TilesReceivedTime", tiles_received_time_);
   UMA_HISTOGRAM_LOAD_TIME("NewTabPage.LoadTime", load_time);
 
   // Split between ML (aka SuggestionsService) and MV (aka TopSites).
   if (has_server_side_suggestions) {
@@ skipping 24 matching lines @@
     UMA_HISTOGRAM_LOAD_TIME("NewTabPage.LoadTime.Startup", load_time);
   } else {
     UMA_HISTOGRAM_LOAD_TIME("NewTabPage.TilesReceivedTime.NewTab",
                             tiles_received_time_);
     UMA_HISTOGRAM_LOAD_TIME("NewTabPage.LoadTime.NewTab", load_time);
   }
 
   has_emitted_ = true;
   during_startup_ = false;
 }