Don't show wifi lock icon in the status bar.

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 152 matching lines @@
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkIcon
 
 // Sets up and generates an SkBitmap for a Network icon.
 class NetworkIcon {
  public:
+  // Default constructor is used by the status bar icon (NetworkMenuIcon).
   NetworkIcon()
       : state_(STATE_UNKNOWN),
         strength_index_(-1),
         icon_(NULL),
         top_left_badge_(NULL),
         top_right_badge_(NULL),
         bottom_left_badge_(NULL),
-        bottom_right_badge_(NULL) {
+        bottom_right_badge_(NULL),
+        is_status_bar_(true) {

[DaveMoore, 2011/08/12 16:57:49]

I think this would be better named if it wasn't specific to the type of use, but
was a flag indicating whether the encrypted badge was to be used. Maybe
show_encrypted_badge? That's true unless you expect there to be more flags like
this to distinguish the status bar usage from others.

   }
 
+  // Service path constructor for cached network service icons.
   explicit NetworkIcon(const std::string& service_path)
       : service_path_(service_path),
         state_(STATE_UNKNOWN),
         strength_index_(-1),
         icon_(NULL),
         top_left_badge_(NULL),
         top_right_badge_(NULL),
         bottom_left_badge_(NULL),
-        bottom_right_badge_(NULL) {
+        bottom_right_badge_(NULL),
+        is_status_bar_(false) {
   }
 
   ~NetworkIcon() {
   }
 
   void ClearIconAndBadges() {
     icon_ = NULL;
     top_left_badge_ = NULL;
     top_right_badge_ = NULL;
     bottom_left_badge_ = NULL;
@@ skipping 90 matching lines @@
       case TYPE_ETHERNET: {
         if (network->disconnected()) {
           bottom_right_badge_ =
               rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED);
         }
         break;
       }
       case TYPE_WIFI: {
         const WifiNetwork* wifi =
             static_cast<const WifiNetwork*>(network);
-        if (wifi->encrypted())
+        if (wifi->encrypted() && !is_status_bar_)
           bottom_right_badge_ = rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE);
         break;
       }
       case TYPE_CELLULAR: {
         const CellularNetwork* cellular =
             static_cast<const CellularNetwork*>(network);
         if (cellular->roaming_state() == ROAMING_STATE_ROAMING)
           top_left_badge_ = rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_ROAMING);
         if (!cellular->connecting())
           bottom_right_badge_ = BadgeForNetworkTechnology(cellular);
@@ skipping 79 matching lines @@
  private:
   std::string service_path_;
   ConnectionState state_;
   int strength_index_;
   SkBitmap bitmap_;
   const SkBitmap* icon_;
   const SkBitmap* top_left_badge_;
   const SkBitmap* top_right_badge_;
   const SkBitmap* bottom_left_badge_;
   const SkBitmap* bottom_right_badge_;
+  bool is_status_bar_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkIcon);
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuIcon
 
 NetworkMenuIcon::NetworkMenuIcon(Delegate* delegate, Mode mode)
     : mode_(mode),
@@ skipping 261 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