Replace network combobox with network dropdown button

chrome/browser/chromeos/dom_ui/internet_options_handler.cc

 // Copyright (c) 2010 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/dom_ui/internet_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/string16.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/status/network_menu_button.h"
+#include "chrome/browser/chromeos/status/network_menu.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/codec/png_codec.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 188 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ListValue* list = new ListValue();
 
   // If ethernet is not enabled, then don't add anything.
   if (cros->ethernet_enabled()) {
     const chromeos::EthernetNetwork& ethernet_network =
         cros->ethernet_network();
     SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_WIRED_BLACK);
     if (!ethernet_network.connecting() &&
         !ethernet_network.connected()) {
-      icon = chromeos::NetworkMenuButton::IconForDisplay(icon,
+      icon = chromeos::NetworkMenu::IconForDisplay(icon,
           *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
     }
     list->Append(GetNetwork(
         ethernet_network.service_path(),
         icon,
         l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
         ethernet_network.connecting(),
         ethernet_network.connected(),
         chromeos::TYPE_ETHERNET,
         false));
   }
   return list;
 }
 
 ListValue* InternetOptionsHandler::GetWirelessList() {
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ListValue* list = new ListValue();
 
   const chromeos::WifiNetworkVector& wifi_networks = cros->wifi_networks();
   for (chromeos::WifiNetworkVector::const_iterator it =
       wifi_networks.begin(); it != wifi_networks.end(); ++it) {
-    SkBitmap icon = chromeos::NetworkMenuButton::IconForNetworkStrength(
+    SkBitmap icon = chromeos::NetworkMenu::IconForNetworkStrength(
         it->strength(), true);
     if (it->encrypted()) {
-      icon = chromeos::NetworkMenuButton::IconForDisplay(icon,
+      icon = chromeos::NetworkMenu::IconForDisplay(icon,
           *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
     }
     list->Append(GetNetwork(
         it->service_path(),
         icon,
         it->name(),
         it->connecting(),
         it->connected(),
         chromeos::TYPE_WIFI,
         false));
   }
 
   const chromeos::CellularNetworkVector& cellular_networks =
       cros->cellular_networks();
   for (chromeos::CellularNetworkVector::const_iterator it =
       cellular_networks.begin(); it != cellular_networks.end(); ++it) {
-    SkBitmap icon = chromeos::NetworkMenuButton::IconForNetworkStrength(
+    SkBitmap icon = chromeos::NetworkMenu::IconForNetworkStrength(
         it->strength(), true);
     SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G);
-    icon = chromeos::NetworkMenuButton::IconForDisplay(icon, badge);
+    icon = chromeos::NetworkMenu::IconForDisplay(icon, badge);
     list->Append(GetNetwork(
         it->service_path(),
         icon,
         it->name(),
         it->connecting(),
         it->connected(),
         chromeos::TYPE_CELLULAR,
         false));
   }
 
@@ skipping 17 matching lines @@
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   ListValue* list = new ListValue();
 
   const chromeos::WifiNetworkVector& wifi_networks =
       cros->remembered_wifi_networks();
   for (chromeos::WifiNetworkVector::const_iterator it =
       wifi_networks.begin(); it != wifi_networks.end(); ++it) {
     SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0);
     if (it->encrypted()) {
-      icon = chromeos::NetworkMenuButton::IconForDisplay(icon,
+      icon = chromeos::NetworkMenu::IconForDisplay(icon,
           *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
     }
     list->Append(GetNetwork(
         it->service_path(),
         icon,
         it->name(),
         it->connecting(),
         it->connected(),
         chromeos::TYPE_WIFI,
         true));
   }
 
   const chromeos::CellularNetworkVector& cellular_networks =
       cros->remembered_cellular_networks();
   for (chromeos::CellularNetworkVector::const_iterator it =
       cellular_networks.begin(); it != cellular_networks.end(); ++it) {
     SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0);
     SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G);
-    icon = chromeos::NetworkMenuButton::IconForDisplay(icon, badge);
+    icon = chromeos::NetworkMenu::IconForDisplay(icon, badge);
     list->Append(GetNetwork(
         it->service_path(),
         icon,
         it->name(),
         it->connecting(),
         it->connected(),
         chromeos::TYPE_CELLULAR,
         true));
   }
 
   return list;
 }