Fix VPN icon issues

chrome/browser/chromeos/status/network_menu_icon.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_icon.h"
 
 #include <math.h>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 322 matching lines @@
       // VPN should never be the primiary active network. This is used for
       // the icon next to a connected or disconnected VPN.
       const Network* connected_network = cros->connected_network();
       if (connected_network && connected_network->type() != TYPE_VPN) {
         // Set the icon and badges for the connected network.
         SetIcon(connected_network);
         SetBadges(connected_network);
       } else {
         // Use the ethernet icon for VPN when not connected.
         icon_ = rb.GetBitmapNamed(IDR_STATUSBAR_WIRED);
+        // We can be connected to a VPN, even when there is no connected
+        // underlying network. In that case, for the status bar, show the
+        // disconencted badge.
+        if (is_status_bar_) {
+          bottom_right_badge_ =
+              rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED);
+        }
       }
       // Overlay the VPN badge.
       bottom_left_badge_ = rb.GetBitmapNamed(kVpnBadgeId);
     } else {
       SetIcon(network);
       SetBadges(network);
     }
   }
 
   // Generates the bitmap. Call after setting the icon and badges.
@@ skipping 206 matching lines @@
   }
 
   // If we are not connecting to a network, show the active network.
   const Network* network = cros->active_network();
   if (network) {
     bool animating = false;
     last_network_type_ = network->type();
     // Icon + badges.
     icon_->SetDirty();
     icon_->UpdateIcon(network);
-    // Overlay the VPN badge if connected or connecting to a VPN.
-    if (cros->virtual_network()) {
+    // Overlay the VPN badge if connecting to a VPN.
+    if (network->type() != TYPE_VPN && cros->virtual_network()) {
       const SkBitmap* vpn_badge = rb.GetBitmapNamed(kVpnBadgeId);
       if (cros->virtual_network()->connecting()) {
         double animation = GetAnimation();
         animating = true;
         // Even though this is the only place we use vpn_connecting_badge_,
         // it is important that this is a member variable since we set a
         // pointer to it and access that pointer in icon_->GenerateBitmap().
         vpn_connecting_badge_ = SkBitmapOperations::CreateBlendedBitmap(
             empty_vpn_badge_, *vpn_badge, animation);
         icon_->set_bottom_left_badge(&vpn_connecting_badge_);
-      } else if (cros->virtual_network()->connected()) {
-        icon_->set_bottom_left_badge(vpn_badge);
       }
     }
     if (!animating)
       animation_connecting_.Stop();
     // Text.
     if (text) {
       switch (network->type()) {
         case TYPE_ETHERNET:
           if (mode_ == MENU_MODE) {
             *text = l10n_util::GetStringFUTF16(
@@ skipping 85 matching lines @@
         ethernet_icon->width(), ethernet_icon->height(), false);
     canvas.DrawBitmapInt(*ethernet_icon, 0, 0);
     const SkBitmap* vpn_badge = rb.GetBitmapNamed(kVpnBadgeId);
     canvas.DrawBitmapInt(*vpn_badge, kBadgeLeftX, kBadgeBottomY);
     vpn_bitmap = new SkBitmap(canvas.ExtractBitmap());
   }
   return vpn_bitmap;
 }
 
 }  // chromeos