3 files changed, 30 insertions, 18 deletions
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml
index 9fa95b1..604791b 100644
--- a/tools/metrics/actions/actions.xml
+++ b/tools/metrics/actions/actions.xml
@@ -11999,13 +11999,4 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
-<action name="webapps.LaunchedFromHome">
-  <owner>dfalcantara@chromium.org</owner>
-  <description>
-    User launched a WebappActivity from the Android Home screen.  This
-    explicitly does not count relaunching WebappActivities via Android's
-    Recents menu.
-  </description>
-</action>
-
 </actions>
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 322bc45..41903de 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -12459,6 +12459,13 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>Application languages used for UI.</summary>
 </histogram>
 
+<histogram name="Launch.HomeScreen" enum="LaunchFromHomeScreen">
+  <owner>dfalcantara@chromium.org</owner>
+  <summary>
+    Records how Chrome handled a launch from an Android Home screen shortcut.
+  </summary>
+</histogram>
+
 <histogram name="LevelDBEnv.All.SafeThreadAccess" units="accesses">
   <obsolete>
     Deprecated 2013-10. No thread-unsafety was found.
@@ -52059,6 +52066,11 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="8" label="HandleUpdateOrigins Invalid"/>
 </enum>
 
+<enum name="LaunchFromHomeScreen" type="int">
+  <int value="0" label="Launched as standalone web app"/>
+  <int value="1" label="Launched as a tab"/>
+</enum>
+
 <enum name="LevelDBCorruptionTypes" type="int">
   <int value="0" label="other"/>
   <int value="1" label="missing files"/>
diff --git a/tools/metrics/rappor/rappor.xml b/tools/metrics/rappor/rappor.xml
index 3d06174..a4f123f 100644
--- a/tools/metrics/rappor/rappor.xml
+++ b/tools/metrics/rappor/rappor.xml
@@ -106,6 +106,24 @@ components/rappor/rappor_service.cc.
   </summary>
 </rappor-metric>
 
+<rappor-metric name="Launch.HomeScreen.Shortcut" type="ETLD_PLUS_ONE">
+  <owner>dfalcantara@chromium.org</owner>
+  <summary>
+    The eTLD+1 of a URL that was launched from the Android Home screen into a
+    tab.  This explicitly does not count relaunches via the Android Recents
+    menu.
+  </summary>
+</rappor-metric>
+
+<rappor-metric name="Launch.HomeScreen.Standalone" type="ETLD_PLUS_ONE">
+  <owner>dfalcantara@chromium.org</owner>
+  <summary>
+    The eTLD+1 of a URL that was launched from the Android Home screen into a
+    WebappActivity.  This explicitly does not count relaunches via the Android
+    Recents menu.
+  </summary>
+</rappor-metric>
+
 <rappor-metric name="Plugins.FlashOriginUrl" type="ETLD_PLUS_ONE">
   <owner>wfh@chromium.org</owner>
   <summary>
@@ -210,15 +228,6 @@ components/rappor/rappor_service.cc.
   </summary>
 </rappor-metric>
 
-<rappor-metric name="webapps.LaunchURL" type="ETLD_PLUS_ONE">
-  <owner>dfalcantara@chromium.org</owner>
-  <summary>
-    The eTLD+1 of a URL that was launched from the Android Home screen into a
-    WebappActivity.  This explicitly does not count relaunches via the Android
-    Recents menu.
-  </summary>
-</rappor-metric>
-
 </rappor-metrics>
 
 </rappor-configuration>