Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Unified Diff: chrome/browser/about_flags.cc

Issue 7053015: Revert 86642 - Remove --enable-vpn (enabled always) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
===================================================================
--- chrome/browser/about_flags.cc (revision 86649)
+++ chrome/browser/about_flags.cc (working copy)
@@ -296,6 +296,18 @@
SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess)
},
{
+ "enable-vpn",
+ IDS_FLAGS_ENABLE_VPN_NAME,
+ IDS_FLAGS_ENABLE_VPN_DESCRIPTION,
+ kOsCrOS,
+#if defined(OS_CHROMEOS)
+ // The switch exists only on Chrome OS.
+ SINGLE_VALUE_TYPE(switches::kEnableVPN)
+#else
+ SINGLE_VALUE_TYPE("")
+#endif
+ },
+ {
"multi-profiles",
IDS_FLAGS_MULTI_PROFILES_NAME,
IDS_FLAGS_MULTI_PROFILES_DESCRIPTION,
« no previous file with comments | « no previous file | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698