Revert 86642 - Remove --enable-vpn (enabled always)

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/status/network_menu.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/command_line.h"
@@ skipping 762 matching lines @@
   }
 
   // No networks available message.
   if (menu_items_.empty()) {
     label = l10n_util::GetStringFUTF16(IDS_STATUSBAR_NETWORK_MENU_ITEM_INDENT,
                 l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE));
     menu_items_.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND, label,
         SkBitmap(), std::string(), FLAG_DISABLED));
   }
 
-  // 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 (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);
+    }
   }
 
   // Enable / disable wireless.
   if (wifi_available || cellular_available) {
     menu_items_.push_back(MenuItem());  // Separator
 
     if (wifi_available) {
       // Add 'Scanning...'
       if (cros->wifi_scanning()) {
         label = l10n_util::GetStringUTF16(IDS_STATUSBAR_WIFI_SCANNING_MESSAGE);
@@ skipping 629 matching lines @@
 
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(source, &screen_loc);
   gfx::Rect bounds(screen_loc, source->size());
   network_menu_->GetSubmenu()->set_minimum_preferred_width(min_width_);
   network_menu_->RunMenuAt(window, GetMenuButton(), bounds,
       views::MenuItemView::TOPRIGHT, true);
 }
 
 }  // namespace chromeos