NTP: Record TileType metrics also on desktop

chrome/browser/ui/webui/ntp/ntp_user_data_logger.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_
 
 #include <stddef.h>
 
 #include <bitset>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "chrome/common/search/ntp_logging_events.h"
 #include "components/ntp_tiles/tile_source.h"
+#include "components/ntp_tiles/tile_visual_type.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace content {
 class WebContents;
 }
 
 // Helper class for logging data from the NTP. Attached to each NTP instance.
 class NTPUserDataLogger
     : public content::WebContentsObserver,
       public content::WebContentsUserData<NTPUserDataLogger> {
  public:
   ~NTPUserDataLogger() override;
 
   // Gets the associated NTPUserDataLogger, creating it if necessary.
   //
   // MUST be called only when the NTP is active.
   static NTPUserDataLogger* GetOrCreateFromWebContents(
       content::WebContents* content);
 
   // Called when an event occurs on the NTP that requires a counter to be
   // incremented. |time| is the delta time from navigation start until this
   // event happened.
   void LogEvent(NTPLoggingEventType event, base::TimeDelta time);
 
   // Logs an impression on one of the NTP tiles by a given source.
   void LogMostVisitedImpression(int position,
-                                ntp_tiles::TileSource tile_source);
+                                ntp_tiles::TileSource tile_source,
+                                ntp_tiles::TileVisualType tile_type);
 
   // Logs a navigation on one of the NTP tiles by a given source.
   void LogMostVisitedNavigation(int position,
-                                ntp_tiles::TileSource tile_source);
+                                ntp_tiles::TileSource tile_source,
+                                ntp_tiles::TileVisualType tile_type);
 
  protected:
   explicit NTPUserDataLogger(content::WebContents* contents);
 
  private:
   friend class content::WebContentsUserData<NTPUserDataLogger>;
 
   FRIEND_TEST_ALL_PREFIXES(NTPUserDataLoggerTest, TestLogMostVisitedImpression);
   FRIEND_TEST_ALL_PREFIXES(NTPUserDataLoggerTest, TestNumberOfTiles);
   FRIEND_TEST_ALL_PREFIXES(NTPUserDataLoggerTest, TestLoadTime);
@@ skipping 20 matching lines @@
   // If something happens that causes the NTP to pull tiles from different
   // sources, such as signing in (switching from client to server tiles), then
   // only the impressions for the first source will be logged, leaving the
   // number of impressions for a source slightly out-of-sync with navigations.
   std::bitset<kNumMostVisited> impression_was_logged_;
 
   // Stores the tile source for each impression. Entries are only valid if the
   // corresponding entry in |impression_was_logged_| is true.
   std::vector<ntp_tiles::TileSource> impression_tile_source_;
 
+  // Stores the tile type for each impression. Entries are only valid if the
+  // corresponding entry in |impression_was_logged_| is true.
+  std::vector<ntp_tiles::TileVisualType> impression_tile_type_;
+
   // The time we received the NTP_ALL_TILES_RECEIVED event.
   base::TimeDelta tiles_received_time_;
 
   // Whether we have already emitted NTP stats for this web contents.
   bool has_emitted_;
 
   // Are stats being logged during Chrome startup?
   bool during_startup_;
 
   // The URL of this New Tab Page - varies based on NTP version.
   GURL ntp_url_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPUserDataLogger);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_