| Index: tools/metrics/actions/actions.xml
|
| diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml
|
| index 2731167484b85b34b3a39f8cd040bbbb0bb4da88..1701e70c9b56b3d3268e15505d9723063b9513a4 100644
|
| --- a/tools/metrics/actions/actions.xml
|
| +++ b/tools/metrics/actions/actions.xml
|
| @@ -8506,9 +8506,7 @@ should be able to be added at any place in this file.
|
| <description>
|
| Captive portal authorization bypass proxy is disabled.
|
| </description>
|
| - <obsolete>
|
| - Deprecated as of 03/2015. Option is removed.
|
| - </obsolete>
|
| + <obsolete>Deprecated as of 03/2015. Option is removed.</obsolete>
|
| </action>
|
|
|
| <action name="Options_CaptivePortalBypassProxy_Enable">
|
| @@ -8516,9 +8514,7 @@ should be able to be added at any place in this file.
|
| <description>
|
| Captive portal authorization bypass proxy is enabled.
|
| </description>
|
| - <obsolete>
|
| - Deprecated as of 03/2015. Option is removed.
|
| - </obsolete>
|
| + <obsolete>Deprecated as of 03/2015. Option is removed.</obsolete>
|
| </action>
|
|
|
| <action name="Options_ChangeDefaultZoomLevel">
|
| @@ -9077,6 +9073,22 @@ should be able to be added at any place in this file.
|
| <description>Please enter the description of this user action.</description>
|
| </action>
|
|
|
| +<action name="Options_NetworkAddVPNBuiltIn">
|
| + <owner>stevenjb@chromium.org</owner>
|
| + <description>
|
| + Settings: Internet connection: VPN dropdown: Show built-in dialog for adding
|
| + an OpenVPN or L2TP VPN.
|
| + </description>
|
| +</action>
|
| +
|
| +<action name="Options_NetworkAddVPNThirdParty">
|
| + <owner>stevenjb@chromium.org</owner>
|
| + <description>
|
| + Settings: Internet connection: VPN dropdown: Show "add network"
|
| + dialog for a third-party VPN provider.
|
| + </description>
|
| +</action>
|
| +
|
| <action name="Options_NetworkAutoConnect">
|
| <owner>stevenjb@chromium.org</owner>
|
| <description>
|
| @@ -9117,6 +9129,7 @@ should be able to be added at any place in this file.
|
| <description>
|
| Settings: Internet connection: VPN dropdown: Join other
|
| </description>
|
| + <obsolete>Replaced by Options_NetworkAddVPNBuiltIn.</obsolete>
|
| </action>
|
|
|
| <action name="Options_NetworkJoinOtherWifi">
|
|
|