Chromium Code Reviews| Index: tools/metrics/histograms/histograms.xml |
| diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml |
| index 4e5b7cfb81118f9ca26dd178b6bdf2527c9e273d..271852a8b493ea7718ebc11465162f27d12cb2fd 100644 |
| --- a/tools/metrics/histograms/histograms.xml |
| +++ b/tools/metrics/histograms/histograms.xml |
| @@ -79809,10 +79809,13 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. |
| label="Allow remote users to interact with elevated windows in remote |
| assistance sessions"/> |
| <int value="345" label="Enables HTTP/0.9 support on non-default ports"/> |
| - <int value="346" label="Enables force sign in for browser."/> |
| - <int value="347" label="Always open PDF in external viewer."/> |
| - <int value="348" label="Force YouTube Restricted Mode"/> |
| - <int value="349" label="Report information about the status of Android."/> |
| + <int value="346" label="Enables force sign in for Google Chrome."/> |
|
jdufault
2016/10/21 19:03:45
Looks like you have a merge conflict here.
sammiequon
2016/10/21 23:49:25
I think it was because of rebase.
|
| + <int value="347" label="Always Open PDF files externally"/> |
| + <int value="348" label="Force minimum YouTube Restricted Mode"/> |
| + <int value="349" label="Report information about status of Android"/> |
| + <int value="350" label="Enable methods for unlocking the lock screen."/> |
| + <int value="351" |
| + label="Sets how often user has to enter password to use quick unlock."/> |
| </enum> |
| <enum name="EnterprisePolicyInvalidations" type="int"> |