[Password Generation] Update UI to match final mocks.

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index e4515c0a7cffe6d873ad79348a1e6961287f36c5..85f75acfb923631e4a111788ebe1d8c49f2a77d4 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -12587,6 +12587,19 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="PasswordGeneration.Event" enum="PasswordGenerationEvent">
+  <summary>
+    Measures the frequency of various password generation events.
+
+    Note that this histogram is logged from the renderer process, and
+    consequently the numbers should not be directly compared to the other
+    PasswordGeneration.* histograms, which are logged from the browser process.
+    Histograms logged in different processes are lost at different rates, which
+    introduces systematic bias between histograms logged in the renderer process
+    vs. those logged in the browser process.
+  </summary>
+</histogram>
+
 <histogram name="PasswordGeneration.UploadStarted" enum="Boolean">
   <summary>
     The number of times that we try to upload a form that we believe should
@@ -28816,6 +28829,19 @@ other types of suffix sets.
   <int value="3" label="Cookie contains both control chars and is invalid"/>
 </enum>
 
+<enum name="PasswordGenerationEvent" type="int">
+  <int value="0" label="No sign up form"/>
+  <int value="1" label="Local heuristics found sign up form"/>
+  <int value="2" label="DEPRECATED: Icon shown"/>
+  <int value="3" label="DEPRECATED: Bubble shown"/>
+  <int value="4" label="Generation available"/>
+  <int value="5" label="Generation popup shown"/>
+  <int value="6" label="Generated password accepted"/>
+  <int value="7" label="Editing popup shown"/>
+  <int value="8" label="Generated password edited"/>
+  <int value="9" label="Generated password deleted"/>
+</enum>
+
 <enum name="PasswordManagerActionsTaken" type="int">
   <obsolete>
     Deprecated as of Chrome 32. See PasswordManagerActionsTakenWithPsl