Cleanup network type matching.

ash/system/chromeos/network/network_icon.cc

 // Copyright (c) 2012 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 "ash/system/chromeos/network/network_icon.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/network_icon_animation_observer.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 446 matching lines @@
 const gfx::ImageSkia* BadgeForVPN(IconType icon_type) {
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_AURA_UBER_TRAY_NETWORK_VPN_BADGE);
 }
 
 gfx::ImageSkia GetIcon(const NetworkState* network,
                        IconType icon_type,
                        int strength_index) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const std::string& type = network->type();
-  if (type == flimflam::kTypeEthernet) {
+  if (network->IsTypeEthernet()) {
     return *rb.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_WIRED);
   } else if (type == flimflam::kTypeWifi ||
              type == flimflam::kTypeWimax ||
              type == flimflam::kTypeCellular) {
     DCHECK(strength_index > 0);
     return GetImageForIndex(
         ImageTypeForNetworkType(type), icon_type, strength_index);
   } else if (type == flimflam::kTypeVPN) {
     return *rb.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_VPN);
   } else {
@@ skipping 60 matching lines @@
   // Determine whether or not we need to update the icon.
   bool dirty = image_.isNull();
 
   // If the network state has changed, the icon needs updating.
   if (state_ != network->connection_state()) {
     state_ = network->connection_state();
     dirty = true;
   }
 
   const std::string& type = network->type();
-  if (type != flimflam::kTypeEthernet)
+  if (!network->IsTypeEthernet())
     dirty |= UpdateWirelessStrengthIndex(network);
 
   if (type == flimflam::kTypeCellular)
     dirty |= UpdateCellularState(network);
 
   if (IconTypeHasVPNBadge(icon_type_) && type != flimflam::kTypeVPN)
     dirty |= UpdateVPNBadge();
 
   if (dirty) {
     // Set the icon and badges based on the network and generate the image.
@@ skipping 159 matching lines @@
       return l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING, UTF8ToUTF16(network->name()));
     }
     if (activation_state == flimflam::kActivationStateActivating) {
       return l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_ACTIVATING, UTF8ToUTF16(network->name()));
     }
   }
 
   // Otherwise just show the network name or 'Ethernet'.
-  if (network->type() == flimflam::kTypeEthernet) {
+  if (network->IsTypeEthernet()) {
     return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ETHERNET);
   } else {
     return UTF8ToUTF16(network->name());
   }
 }
 
 int GetCellularUninitializedMsg() {
   static base::Time s_uninitialized_state_time;
   static int s_uninitialized_msg(0);
 
@@ skipping 44 matching lines @@
   // network.
   if (connecting_network &&
       (!connected_network ||
        connect_handler->HasConnectingNetwork(connecting_network->path()))) {
     network = connecting_network;
   } else {
     network = connected_network;
   }
 
   // Don't show ethernet in the tray
-  if (icon_type == ICON_TYPE_TRAY &&
-      network && network->type() == flimflam::kTypeEthernet) {
+  if (icon_type == ICON_TYPE_TRAY && network && network->IsTypeEthernet()) {
     *image = gfx::ImageSkia();
     *animating = false;
     return;
   }
 
   if (!network) {
     // If no connecting network, check if we are activating a network.
     const NetworkState* mobile_network = state_handler->FirstNetworkByType(
         NetworkStateHandler::kMatchTypeMobile);
     if (mobile_network && (mobile_network->activation_state() ==
@@ skipping 35 matching lines @@
        iter != networks.end(); ++iter) {
     network_paths.insert((*iter)->path());
   }
   PurgeIconMap(ICON_TYPE_TRAY, network_paths);
   PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);
   PurgeIconMap(ICON_TYPE_LIST, network_paths);
 }
 
 }  // namespace network_icon
 }  // namespace ash