Log bookmark clicks in bookmark folders and overflow.

Previously, only top-level bookmark buttons were logged.

Bug: 951899
Change-Id: I9480ed64186ddc068db9a3184363680596df5b46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1572811Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Commit-Queue: Dana Fried <dfried@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652590}

chrome/browser/bookmarks/bookmark_stats.cc

@@ -10,15 +10,9 @@
 
 using bookmarks::BookmarkNode;
 
-void RecordBookmarkLaunch(const BookmarkNode* node,
-                          BookmarkLaunchLocation location) {
-  if (location == BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR ||
-      location == BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR) {
-    base::RecordAction(base::UserMetricsAction("ClickedBookmarkBarURLButton"));
-  }
-  UMA_HISTOGRAM_ENUMERATION(
-      "Bookmarks.LaunchLocation", location, BOOKMARK_LAUNCH_LOCATION_LIMIT);
+namespace {
 
+void RecordNodeDepth(const BookmarkNode* node) {
   if (!node)
     return;
 
@@ -33,16 +27,32 @@ void RecordBookmarkLaunch(const BookmarkNode* node,
   UMA_HISTOGRAM_COUNTS_1M("Bookmarks.LaunchDepth", depth - 2);
 }
 
+bool IsBookmarkBarLocation(BookmarkLaunchLocation location) {
+  return location == BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR ||
+         location == BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR ||
+         location == BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER;
+}
+
+}  // namespace
+
+void RecordBookmarkLaunch(const BookmarkNode* node,
+                          BookmarkLaunchLocation location) {
+  if (IsBookmarkBarLocation(location))
+    base::RecordAction(base::UserMetricsAction("ClickedBookmarkBarURLButton"));
+
+  UMA_HISTOGRAM_ENUMERATION("Bookmarks.LaunchLocation", location,
+                            BOOKMARK_LAUNCH_LOCATION_LIMIT);
+
+  RecordNodeDepth(node);
+}
+
 void RecordBookmarkFolderOpen(BookmarkLaunchLocation location) {
-  if (location == BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR ||
-      location == BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR) {
+  if (IsBookmarkBarLocation(location))
     base::RecordAction(base::UserMetricsAction("ClickedBookmarkBarFolder"));
-  }
 }
 
 void RecordBookmarkAppsPageOpen(BookmarkLaunchLocation location) {
-  if (location == BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR ||
-      location == BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR) {
+  if (IsBookmarkBarLocation(location)) {
     base::RecordAction(
         base::UserMetricsAction("ClickedBookmarkBarAppsShortcutButton"));
   }

tools/metrics/actions/actions.xml

@@ -4073,8 +4073,12 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="ClickedBookmarkBarURLButton">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <description>Please enter the description of this user action.</description>
+  <owner>dfried@chromium.org</owner>
+  <description>
+    User clicks a bookmark to open it, either in the bookmarks bar or in a
+    bookmarks bar folder or overflow menu. (Changed in M75 to include
+    non-top-level bookmarks.)
+  </description>
 </action>
 
 <action name="ClickToPlay_AllowAlways">