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

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 6992074: 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 | « chrome/browser/chromeos/cros/cros_mock.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 0665312fd338555545ed6c8924128139fcb0a1f3..2d06590b6b3750abf283205b717c88712fe7d9bb 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -780,19 +780,17 @@ void MainMenuModel::InitMenuItems(bool is_browser_mode,
SkBitmap(), std::string(), FLAG_DISABLED));
}
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableVPN)) {
- // If there's a connected network, add submenu for Private Networks.
- const Network* connected_network = cros->connected_network();
- if (connected_network) {
- menu_items_.push_back(MenuItem()); // Separator
- menu_items_.push_back(MenuItem(
- ui::MenuModel::TYPE_SUBMENU,
- l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_PRIVATE_NETWORKS),
- VPNMenuModel::IconForDisplay(connected_network),
- vpn_menu_model_.get(), FLAG_NONE));
- vpn_menu_model_->InitMenuItems(
- is_browser_mode, should_open_button_options);
- }
+ // If there's a connected network, add submenu for Private Networks.
+ const Network* connected_network = cros->connected_network();
+ if (connected_network) {
+ menu_items_.push_back(MenuItem()); // Separator
+ menu_items_.push_back(MenuItem(
+ ui::MenuModel::TYPE_SUBMENU,
+ l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_PRIVATE_NETWORKS),
+ VPNMenuModel::IconForDisplay(connected_network),
+ vpn_menu_model_.get(), FLAG_NONE));
+ vpn_menu_model_->InitMenuItems(
+ is_browser_mode, should_open_button_options);
}
// Enable / disable wireless.
« no previous file with comments | « chrome/browser/chromeos/cros/cros_mock.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698