Cleanup network type matching.

chrome/browser/ui/webui/options/chromeos/internet_options_handler.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 "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 420 matching lines @@
     : service_path_(network->path()),
       name_(network->name()),
       connecting_(network->IsConnectingState()),
       connected_(network->IsConnectedState()),
       connectable_(network->connectable()),
       connection_type_(network->type()),
       remembered_(false),
       shared_(false),
       activation_state_(network->activation_state()),
       policy_managed_(network->IsManaged()) {
-  if (network->type() == flimflam::kTypeEthernet)
+  if (network->IsTypeEthernet())
     name_ = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   gfx::ImageSkia icon = ash::network_icon::GetImageForNetwork(
       network, ash::network_icon::ICON_TYPE_LIST);
   SetIcon(icon, icon_scale_factor);
 }
 
 NetworkInfoDictionary::NetworkInfoDictionary(const FavoriteState* favorite,
                                              ui::ScaleFactor icon_scale_factor)
     : service_path_(favorite->path()),
       name_(favorite->name()),
       connecting_(false),
       connected_(false),
       connectable_(false),
       connection_type_(favorite->type()),
       remembered_(true),
       shared_(!favorite->IsPrivate()),
       policy_managed_(favorite->IsManaged()) {
-  if (favorite->type() == flimflam::kTypeEthernet)
+  if (favorite->IsTypeEthernet())
     name_ = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   gfx::ImageSkia icon = ash::network_icon::GetImageForDisconnectedNetwork(
       ash::network_icon::ICON_TYPE_LIST, favorite->type());
   SetIcon(icon, icon_scale_factor);
 }
 
 base::DictionaryValue* NetworkInfoDictionary::BuildDictionary() {
   std::string status;
   if (remembered_) {
     if (shared_)
@@ skipping 1058 matching lines @@
   std::string type = network->type();
   dictionary.SetString(kTagType, type);
   dictionary.SetString(kTagServicePath, network->path());
   dictionary.SetString(kTagNameServerType, name_server_type);
   dictionary.SetString(kTagNameServersGoogle, kGoogleNameServers);
 
   // Only show proxy for remembered networks.
   dictionary.SetBoolean(kTagShowProxy, !network->profile_path().empty());
 
   // Enable static ip config for ethernet. For wifi, enable if flag is set.
-  bool staticIPConfig = type == flimflam::kTypeEthernet ||
-      (type == flimflam::kTypeWifi &&
-       CommandLine::ForCurrentProcess()->HasSwitch(
-           chromeos::switches::kEnableStaticIPConfig));
+  bool staticIPConfig = network->IsTypeEthernet() ||
+                        (type == flimflam::kTypeWifi &&
+                         CommandLine::ForCurrentProcess()->HasSwitch(
+                             chromeos::switches::kEnableStaticIPConfig));
   dictionary.SetBoolean(kTagShowStaticIPConfig, staticIPConfig);
 
   dictionary.SetBoolean(kTagShowPreferred, !network->profile_path().empty());
   bool preferred = network->priority() > 0;
   SetValueDictionary(&dictionary, kTagPreferred,
                      new base::FundamentalValue(preferred),
                      property_ui_data);
 
   NetworkPropertyUIData auto_connect_ui_data(onc_source);
   std::string onc_path_to_auto_connect;
@@ skipping 459 matching lines @@
       cellular && cellular->support_network_scan());
 
   dictionary->SetBoolean(kTagWimaxAvailable,
                          handler->IsTechnologyAvailable(flimflam::kTypeWimax));
   dictionary->SetBoolean(kTagWimaxEnabled,
                          handler->IsTechnologyEnabled(flimflam::kTypeWimax));
 }
 
 }  // namespace options
 }  // namespace chromeos