Replace network combobox with network dropdown button

chrome/browser/chromeos/options/internet_page_view.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/options/internet_page_view.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #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"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/image_view.h"
 #include "views/controls/scroll_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 namespace chromeos {
@@ skipping 215 matching lines @@
     : NetworkSection(parent, profile,
                      IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRED_NETWORK) {
 }
 
 void WiredSection::InitSection() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   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));
   }
 
   std::wstring name =
       l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
 
   int s = IDS_STATUSBAR_NETWORK_DEVICE_DISABLED;
   if (cros->ethernet_connecting())
     s = IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING;
   else if (cros->ethernet_connected())
@@ skipping 50 matching lines @@
 
 void WirelessSection::InitSection() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   // Wifi
   wifi_networks_ = cros->wifi_networks();
   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));
     }
 
     bool connecting = wifi_networks_[i].connecting();
     bool connected = wifi_networks_[i].connected();
     AddWirelessNetwork(i, icon, name, connecting, connected, TYPE_WIFI);
   }
 
   // Cellular
   celluar_networks_ = cros->cellular_networks();
   // Cellular networks ssids.
   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();
     AddWirelessNetwork(i, icon, name, connecting, connected, TYPE_CELLULAR);
   }
 }
 
 void WirelessSection::ButtonClicked(int button, int connection_type, int id) {
   if (connection_type == TYPE_CELLULAR) {
     if (static_cast<int>(celluar_networks_.size()) > id) {
@@ skipping 85 matching lines @@
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   // Wifi
   wifi_networks_ = cros->remembered_wifi_networks();
   for (size_t i = 0; i < wifi_networks_.size(); ++i) {
     std::wstring name = ASCIIToWide(wifi_networks_[i].name());
 
     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));
     }
 
     AddNetwork(i, icon, name, false, std::wstring(), FORGET_BUTTON, TYPE_WIFI);
   }
 
   // Cellular
   celluar_networks_ = cros->remembered_cellular_networks();
   // Cellular networks ssids.
   for (size_t i = 0; i < celluar_networks_.size(); ++i) {
     std::wstring name = ASCIIToWide(celluar_networks_[i].name());
 
     SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0);
     // 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);
   }
 }
 
 void RememberedSection::ButtonClicked(int button, int connection_type, int id) {
   if (connection_type == TYPE_CELLULAR) {
     if (static_cast<int>(celluar_networks_.size()) > id) {
       CrosLibrary::Get()->GetNetworkLibrary()->ForgetWirelessNetwork(
@@ skipping 131 matching lines @@
   scroll_view_->SetBounds(GetLocalBounds(false));
   scroll_view_->Layout();
 }
 
 void InternetPageView::InitControlLayout() {
   AddChildView(scroll_view_);
   scroll_view_->SetContents(contents_view_);
 }
 
 }  // namespace chromeos