Replace network combobox with network dropdown button

BUG=chromium-os:4023, chromium-os:4117, chromium-os:4117
TEST=Manual test first OOBE screen

Review URL: http://codereview.chromium.org/3166028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59343 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc
index 91de274..a095f3b 100644
--- a/chrome/browser/chromeos/options/internet_page_view.cc
+++ b/chrome/browser/chromeos/options/internet_page_view.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/options/options_window_view.h"
-#include "chrome/browser/chromeos/status/network_menu_button.h"
+#include "chrome/browser/chromeos/status/network_menu.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/native_button.h"
@@ -249,7 +249,7 @@ void WiredSection::InitSection() {
 
   SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_WIRED_BLACK);
   if (!cros->ethernet_connecting() && !cros->ethernet_connected()) {
-    icon = NetworkMenuButton::IconForDisplay(icon,
+    icon = NetworkMenu::IconForDisplay(icon,
         *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
   }
 
@@ -320,10 +320,10 @@ void WirelessSection::InitSection() {
   for (size_t i = 0; i < wifi_networks_.size(); ++i) {
     std::wstring name = ASCIIToWide(wifi_networks_[i].name());
 
-    SkBitmap icon = NetworkMenuButton::IconForNetworkStrength(
+    SkBitmap icon = NetworkMenu::IconForNetworkStrength(
         wifi_networks_[i].strength(), true);
     if (wifi_networks_[i].encrypted()) {
-      icon = NetworkMenuButton::IconForDisplay(icon,
+      icon = NetworkMenu::IconForDisplay(icon,
           *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
     }
 
@@ -338,12 +338,12 @@ void WirelessSection::InitSection() {
   for (size_t i = 0; i < celluar_networks_.size(); ++i) {
     std::wstring name = ASCIIToWide(celluar_networks_[i].name());
 
-    SkBitmap icon = NetworkMenuButton::IconForNetworkStrength(
+    SkBitmap icon = NetworkMenu::IconForNetworkStrength(
         celluar_networks_[i].strength(), true);
     // TODO(chocobo): Check cellular network 3g/edge.
     SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G);
 //    SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE);
-    icon = NetworkMenuButton::IconForDisplay(icon, badge);
+    icon = NetworkMenu::IconForDisplay(icon, badge);
 
     bool connecting = celluar_networks_[i].connecting();
     bool connected = celluar_networks_[i].connected();
@@ -449,7 +449,7 @@ void RememberedSection::InitSection() {
 
     SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0);
     if (wifi_networks_[i].encrypted()) {
-      icon = NetworkMenuButton::IconForDisplay(icon,
+      icon = NetworkMenu::IconForDisplay(icon,
           *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_SECURE));
     }
 
@@ -466,7 +466,7 @@ void RememberedSection::InitSection() {
     // TODO(chocobo): Check cellular network 3g/edge.
     SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G);
 //    SkBitmap badge = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE);
-    icon = NetworkMenuButton::IconForDisplay(icon, badge);
+    icon = NetworkMenu::IconForDisplay(icon, badge);
 
     AddNetwork(i, icon, name, false, std::wstring(), FORGET_BUTTON,
                TYPE_CELLULAR);