diff options
author | nick <nick@chromium.org> | 2015-06-03 15:49:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-03 22:50:03 +0000 |
commit | c6db242354a45f20a276f6544a97bf910f60ca05 (patch) | |
tree | 85edf5e28b2f696ee4a408205adbee2010078ba3 /tools | |
parent | 696717b571cb426b742c8ca9595f21a567d7db9a (diff) | |
download | chromium_src-c6db242354a45f20a276f6544a97bf910f60ca05.zip chromium_src-c6db242354a45f20a276f6544a97bf910f60ca05.tar.gz chromium_src-c6db242354a45f20a276f6544a97bf910f60ca05.tar.bz2 |
[M44 merge] Run python update_extension_permission.py
extensions\common\permissions\api_permission.h had a value added (on
May 11 for bug 485227) that threw off the numbering. Move it to the
bottom. We should probably also merge this to the branch.
BUG=485227
NOPRESUBMIT=true
NOTRY=true
Original Review URL: https://codereview.chromium.org/1153503003
Original Cr-Commit-Position: refs/heads/master@{#332286}
Conflicts:
extensions/common/permissions/api_permission.h
Review URL: https://codereview.chromium.org/1156553005
Cr-Commit-Position: refs/branch-heads/2403@{#192}
Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}
Diffstat (limited to 'tools')
-rw-r--r-- | tools/metrics/histograms/histograms.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index daad9d5..50e0694 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -52793,6 +52793,8 @@ Therefore, the affected-histogram name has to have at least one dot in it. <int value="80" label="kPrinterProvider"/> <int value="81" label="kSearchEnginesPrivate"/> <int value="82" label="kAutofillPrivate"/> + <int value="83" label="kPasswordsPrivate"/> + <int value="84" label="kUsersPrivate"/> </enum> <enum name="ExtensionPermission3" type="int"> @@ -52991,6 +52993,8 @@ Therefore, the affected-histogram name has to have at least one dot in it. <int value="190" label="kUsbDeviceList"/> <int value="191" label="kUsbDeviceUnknownProduct"/> <int value="192" label="kUsbDeviceUnknownVendor"/> + <int value="193" label="kUsersPrivate"/> + <int value="194" label="kPasswordsPrivate"/> </enum> <enum name="ExtensionServiceVerifyAllSuccess" type="int"> |