mac: Add metrics for AppKit Fullscreen style.

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 dd89b52f6e84b34323b6c4b3884c4ed45bea44c8..e79970ae2c2a4418bc2a73605964d8ff8a073a5d 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -21619,15 +21619,31 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>Events seen by the OSX NSException swizzle.</summary>
 </histogram>
 
-<histogram name="OSX.Fullscreen.Enter" enum="OSXFullscreenParameters">

[Ilya Sherman, 2014/10/21 21:23:56]

Please mark the old histogram as <obsolete> rather than deleting the code
entirely.

[erikchen, 2014/10/24 17:55:02]

Done.

+<histogram name="OSX.Fullscreen.Enter.Style" enum="OSXFullscreenStyle">
   <owner>erikchen@chromium.org</owner>
   <summary>
     This event is recorded each time a user triggers fullscreen for a browser
-    window. The value's bits reflect different parameters. Bit 0: Fullscreen
-    entry mechanism (AppKit vs Immersive). Bit 1: Whether the window was on the
-    primary screen (Primary vs. Secondary). Bit 2: Whether displays have
-    separate spaces options is enabled (Seperate vs Shared). Bit 3: Whether
-    there are multiple screens.
+    window. It indicates the mechanism (immersive vs. AppKit) and the type of
+    AppKit Fullscreen (Presentation Mode vs. Canonical Fullscreen).
+  </summary>
+</histogram>
+
+<histogram name="OSX.Fullscreen.Enter.WindowLocation"
+    enum="OSXFullscreenWindowLocation">
+  <owner>erikchen@chromium.org</owner>
+  <summary>
+    This event is recorded each time a user triggers fullscreen for a browser
+    window. It indicates the screen in which the window was fullscreened, and
+    the number of screens available.
+  </summary>
+</histogram>
+
+<histogram name="OSX.Settings.ScreensHaveSeparateSpaces"
+    enum="OSXScreensHaveSeparateSpaces">
+  <owner>erikchen@chromium.org</owner>
+  <summary>
+    The configuration of the setting &quot;Screens Have Separate Spaces&quot;
+    available in OSX 10.9+.
   </summary>
 </histogram>
 
@@ -48473,46 +48489,44 @@ To add a new entry, add it with any value and run test to compute valid value.
   </int>
 </enum>
 
-<enum name="OSXFullscreenParameters" type="int">
-  <int value="0" label="IMMERSIVE_SECONDARY_SHARED_SINGLE">INVALID</int>
-  <int value="1" label="APPKIT_SECONDARY_SHARED_SINGLE">INVALID</int>
-  <int value="2" label="IMMERSIVE_PRIMARY_SHARED_SINGLE">
-    Immersive Mechanism + Primary Screen + Shared Spaces + Single Screen
-  </int>
-  <int value="3" label="APPKIT_PRIMARY_SHARED_SINGLE">
-    AppKit Mechanism + Primary Screen + Shared Spaces + Single Screen
-  </int>
-  <int value="4" label="IMMERSIVE_SECONDARY_SEPARATE_SINGLE">INVALID</int>
-  <int value="5" label="APPKIT_SECONDARY_SEPARATE_SINGLE">INVALID</int>
-  <int value="6" label="IMMERSIVE_PRIMARY_SEPARATE_SINGLE">
-    Immersive Mechanism + Primary Screen + Separate Spaces + Single Screen
-  </int>
-  <int value="7" label="APPKIT_PRIMARY_SEPARATE_SINGLE">
-    AppKit Mechanism + Primary Screen + Separate Spaces + Single Screen
+<enum name="OSXFullscreenStyle" type="int">
+  <int value="0" label="IMMERSIVE">
+    The window was fullscreened using the immersive mechanism.
   </int>
-  <int value="8" label="IMMERSIVE_SECONDARY_SHARED_MULTIPLE">
-    Immersive Mechanism + Secondary Screen + Shared Spaces + Multiple Screens
+  <int value="1" label="PRESENTATION_MODE">
+    The window was fullscreened using the AppKit mechanism, in Presentation
+    Mode.
   </int>
-  <int value="9" label="APPKIT_SECONDARY_SHARED_MULTIPLE">
-    AppKit Mechanism + Secondary Screen + Shared Spaces + Multiple Screens
+  <int value="2" label="CANONICAL_FULLSCREEN">
+    The window was fullscreened using the AppKit mechanism, in Canonical
+    Fullscreen.
   </int>
-  <int value="10" label="IMMERSIVE_PRIMARY_SHARED_MULTIPLE">
-    Immersive Mechanism + Primary Screen + Shared Spaces + Multiple Screens
+</enum>
+
+<enum name="OSXFullscreenWindowLocation" type="int">
+  <int value="0" label="PRIMARY_SINGLE_SCREEN">
+    The window was located on the primary screen, and there is only a single
+    screen available.
   </int>
-  <int value="11" label="APPKIT_PRIMARY_SHARED_MULTIPLE">
-    AppKit Mechanism + Primary Screen + Shared Spaces + Multiple Screens
+  <int value="1" label="PRIMARY_MULTIPLE_SCREEN">
+    The window was located on the primary screen, and there are multiple screens
+    available.
   </int>
-  <int value="12" label="IMMERSIVE_SECONDARY_SEPARATE_MULTIPLE">
-    Immersive Mechanism + Secondary Screen + Separate Spaces + Multiple Screens
+  <int value="2" label="SECONDARY_MULTIPLE_SCREEN">
+    The window was located on a secondary screen, and there are multiple screens
+    available.
   </int>
-  <int value="13" label="APPKIT_SECONDARY_SEPARATE_MULTIPLE">
-    AppKit Mechanism + Secondary Screen + Separate Spaces + Multiple Screens
+</enum>
+
+<enum name="OSXScreensHaveSeparateSpaces" type="int">
+  <int value="0" label="CAANOT_HAVE_SEPARATE_SPACES">

[Ilya Sherman, 2014/10/21 21:23:56]

nit: "caan" -> "cann"

[erikchen, 2014/10/24 17:55:03]

Done.

+    The "Screens Have Separate Spaces" option is unavailable.
   </int>
-  <int value="14" label="IMMERSIVE_PRIMARY_SEPARATE_MULTIPLE">
-    Immersive Mechanism + Primary Screen + Separate Spaces + Multiple Screens
+  <int value="1" label="SEPARATE_SPACES">
+    The &quot;Screens Have Separate Spaces&quot; option is on.
   </int>
-  <int value="15" label="APPKIT_PRIMARY_SEPARATE_MULTIPLE">
-    AppKit Mechanism + Primary Screen + Separate Spaces + Multiple Screens
+  <int value="2" label="SHARED_SPACES">
+    The &quot;Screens Have Separate Spaces&quot; option is off.
   </int>
 </enum>