summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordbeam <dbeam@chromium.org>2015-03-19 12:04:23 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-19 19:05:51 +0000
commit8cf549e719623e056e46715bdf2b488ea1bad09f (patch)
tree751603588a3a46507bdb83371037e79bdf535d18 /tools
parent0572da3f0351d07f52bbd81f7347d85ab240ee2f (diff)
downloadchromium_src-8cf549e719623e056e46715bdf2b488ea1bad09f.zip
chromium_src-8cf549e719623e056e46715bdf2b488ea1bad09f.tar.gz
chromium_src-8cf549e719623e056e46715bdf2b488ea1bad09f.tar.bz2
Revert of Allow users to add third-party VPNs from the settings page (patchset #5 id:80001 of https://codereview.chromium.org/1017443002/)
Reason for revert: Invalid JS caught by Closure bots: http://build.chromium.org/p/chromium.fyi/builders/Closure%20Compilation%20Linux/builds/18417/steps/compile/logs/stdio Original issue's description: > Allow users to add third-party VPNs from the settings page > > This CL adds "Add $provider..." entries to the "Private network" and > "Add connection" drop-down menus on the Chrome OS settings page. The > contents of these menus updates dynamically as VPN providers are > added/removed. > > BUG=460428 > TEST=Manual > > Committed: https://crrev.com/4f6e1a2ded3a56e7c2d1360b94990b025a309ecb > Cr-Commit-Position: refs/heads/master@{#321395} TBR=michaelpg@chromium.org,stevenjb@chromium.org,isherman@chromium.org,bartfab@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=460428 Review URL: https://codereview.chromium.org/1026463003 Cr-Commit-Position: refs/heads/master@{#321402}
Diffstat (limited to 'tools')
-rw-r--r--tools/metrics/actions/actions.xml16
1 files changed, 0 insertions, 16 deletions
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml
index d699bb7..2731167 100644
--- a/tools/metrics/actions/actions.xml
+++ b/tools/metrics/actions/actions.xml
@@ -9112,27 +9112,11 @@ should be able to be added at any place in this file.
</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 T2TP VPN.
- </description>
-</action>
-
-<action name="Options_NetworkAddVPNThirdParty">
- <owner>stevenjb@chromium.org</owner>
- <description>
- Settings: Internet connection: VPN dropdown: Show &quot;add network&quot; dialog for a third-party VPN provider.
- </description>
-</action>
-
<action name="Options_NetworkJoinOtherVPN">
<owner>stevenjb@chromium.org</owner>
<description>
Settings: Internet connection: VPN dropdown: Join other
</description>
- <obsolete>Replaced by Options_NetworkAddVPNBuiltIn.</obsolete>
</action>
<action name="Options_NetworkJoinOtherWifi">