Cleanup network type matching.

chrome/browser/chromeos/status/network_menu.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/chromeos/status/network_menu.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 367 matching lines @@
 void MainMenuModel::InitMenuItems(bool should_open_button_options) {
   menu_items_.clear();
 
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // Populate our MenuItems with the current list of networks.
   string16 label;
 
   // Ethernet
   // Only display an ethernet icon if enabled, and an ethernet network exists.
-  bool ethernet_enabled = handler->IsTechnologyEnabled(flimflam::kTypeEthernet);
+  bool ethernet_enabled =
+      handler->IsTechnologyEnabled(NetworkStateHandler::kMatchTypeWired);
   const NetworkState* ethernet_network =
-      handler->FirstNetworkByType(flimflam::kTypeEthernet);
+      handler->FirstNetworkByType(NetworkStateHandler::kMatchTypeWired);
   if (ethernet_enabled && ethernet_network) {
     bool ethernet_connecting = ethernet_network->IsConnectingState();
     if (ethernet_connecting) {
       label = l10n_util::GetStringFUTF16(
           IDS_STATUSBAR_NETWORK_DEVICE_STATUS,
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING));
     } else {
       label = l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
     }
@@ skipping 210 matching lines @@
 
   if (default_network) {
     std::string ip_address = default_network->ip_address();
     if (!ip_address.empty()) {
       address_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
           ASCIIToUTF16(ip_address), gfx::ImageSkia(), std::string(),
                        FLAG_DISABLED));
     }
   }
 
-  std::string ethernet_address =
-      handler->FormattedHardwareAddressForType(flimflam::kTypeEthernet);
+  std::string ethernet_address = handler->FormattedHardwareAddressForType(
+      NetworkStateHandler::kMatchTypeWired);
   if (!ethernet_address.empty()) {
     std::string label = l10n_util::GetStringUTF8(
         IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET) + " " + ethernet_address;
     address_items.push_back(MenuItem(
         ui::MenuModel::TYPE_COMMAND,
         UTF8ToUTF16(label), gfx::ImageSkia(), std::string(), FLAG_DISABLED));
   }
 
   std::string wifi_address =
       handler->FormattedHardwareAddressForType(flimflam::kTypeWifi);
@@ skipping 36 matching lines @@
   return main_menu_model_.get();
 }
 
 void NetworkMenu::UpdateMenu() {
   refreshing_menu_ = true;
   main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());
   refreshing_menu_ = false;
 }
 
 }  // namespace chromeos