Fix VPN icon issues

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 737 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 we are logged in and there is a connected network,
+  // If we are logged in and there is a connected network or a connected VPN,
   // add submenu for Private Networks.
   if (is_browser_mode) {
-    const Network* connected_network = cros->connected_network();
-    if (connected_network) {
+    if (cros->connected_network() || cros->virtual_network_connected()) {
       menu_items_.push_back(MenuItem());  // Separator
       const SkBitmap* icon = NetworkMenuIcon::GetVpnBitmap();
       menu_items_.push_back(MenuItem(
           ui::MenuModel::TYPE_SUBMENU,
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_PRIVATE_NETWORKS),
           *icon, vpn_menu_model_.get(), FLAG_NONE));
       vpn_menu_model_->InitMenuItems(
           is_browser_mode, should_open_button_options);
     }
   }
@@ skipping 80 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // VPNMenuModel
 
 void VPNMenuModel::InitMenuItems(bool is_browser_mode,
                                  bool should_open_button_options) {
   // This gets called on initialization, so any changes should be reflected
   // in CrosMock::SetNetworkLibraryStatusAreaExpectations().
 
   menu_items_.clear();
 
-  // VPN only applies if there's a connected underlying network.
+  // Populate our MenuItems with the current list of virtual networks.
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
-  const Network* connected_network = cros->connected_network();
-  if (!connected_network)
-    return;
-
-  // Populate our MenuItems with the current list of virtual networks.
   const VirtualNetworkVector& virtual_networks = cros->virtual_networks();
   const VirtualNetwork* active_vpn = cros->virtual_network();
 
   bool separator_added = false;
   string16 label;
 
   for (size_t i = 0; i < virtual_networks.size(); ++i) {
     const VirtualNetwork* vpn = virtual_networks[i];
     if (vpn->connecting()) {
       label = l10n_util::GetStringFUTF16(
@@ skipping 20 matching lines @@
     const SkBitmap* icon = NetworkMenuIcon::GetBitmap(vpn);
     menu_items_.push_back(
         MenuItem(ui::MenuModel::TYPE_COMMAND,
                  label, *icon, vpn->service_path(), flag));
   }
 
   // Add option to add/disconnect from vpn.
   if (!menu_items_.empty()) {  // Add separator if menu is not empty.
     menu_items_.push_back(MenuItem());
   }
-  menu_items_.push_back(MenuItem(
-      ui::MenuModel::TYPE_COMMAND,
-      l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_ADD_VPN),
-      SkBitmap(), std::string(), FLAG_ADD_VPN));
+  // Can only connect to a VPN if we have a connected network.
+  if (cros->connected_network()) {
+    menu_items_.push_back(MenuItem(
+        ui::MenuModel::TYPE_COMMAND,
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_ADD_VPN),
+        SkBitmap(), std::string(), FLAG_ADD_VPN));
+  }
+  // Show disconnect if we have an active VPN.
   if (active_vpn) {
     menu_items_.push_back(MenuItem(
         ui::MenuModel::TYPE_COMMAND,
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DISCONNECT_VPN),
         SkBitmap(), std::string(), FLAG_DISCONNECT_VPN));
   }
 }
 
 int VPNMenuModel::GetCommandIdAt(int index) const {
   return index + kVPNIndexMask;
@@ skipping 152 matching lines @@
   std::string page = StringPrintf(
       "%s?servicePath=%s&networkType=%d&networkName=%s",
       chrome::kInternetOptionsSubPage,
       EscapeUrlEncodedData(network->service_path(), true).c_str(),
       network->type(),
       EscapeUrlEncodedData(network_name, false).c_str());
   browser->ShowOptionsTab(page);
 }
 
 }  // namespace chromeos