Check for wimax connected/connecting everywhere.

BUG=chromium-os-partner:10324
TEST=See issue
TBR=zel

Review URL: https://chromiumcodereview.appspot.com/10543100

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

4 files changed, 14 insertions, 3 deletions

diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc
index bd4828c..fc765b4 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc
@@ -292,10 +292,12 @@ bool NetworkLibraryImplBase::virtual_network_connected() const {
   return active_virtual_ ? active_virtual_->connected() : false;
 }
 bool NetworkLibraryImplBase::Connected() const {
-  return ethernet_connected() || wifi_connected() || cellular_connected();
+  return ethernet_connected() || wifi_connected() ||
+      cellular_connected() || wimax_connected();
 }
 bool NetworkLibraryImplBase::Connecting() const {
-  return ethernet_connecting() || wifi_connecting() || cellular_connecting();
+  return ethernet_connecting() || wifi_connecting() ||
+      cellular_connecting() || wimax_connecting();
 }
 const WifiNetworkVector& NetworkLibraryImplBase::wifi_networks() const {
   return wifi_networks_;
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index 7fd1bf39..4e5ca77 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -87,12 +87,16 @@ string16 GetCurrentNetworkName(NetworkLibrary* network_library) {
     return UTF8ToUTF16(network_library->wifi_network()->name());
   } else if (network_library->cellular_connected()) {
     return UTF8ToUTF16(network_library->cellular_network()->name());
+  } else if (network_library->wimax_connected()) {
+    return UTF8ToUTF16(network_library->wimax_network()->name());
   } else if (network_library->ethernet_connecting()) {
     return l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   } else if (network_library->wifi_connecting()) {
     return UTF8ToUTF16(network_library->wifi_network()->name());
   } else if (network_library->cellular_connecting()) {
     return UTF8ToUTF16(network_library->cellular_network()->name());
+  } else if (network_library->wimax_connecting()) {
+    return UTF8ToUTF16(network_library->wimax_network()->name());
   } else {
     return string16();
   }
diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc
index 2c90d0b..8be6d77 100644
--- a/chrome/browser/chromeos/status/data_promo_notification.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification.cc
@@ -142,7 +142,7 @@ void DataPromoNotification::ShowOptionalMobileDataPromoNotification(
       !UserManager::Get()->IsLoggedInAsGuest() &&
       check_for_promo_ &&
       cros->cellular_connected() && !cros->ethernet_connected() &&
-      !cros->wifi_connected()) {
+      !cros->wifi_connected() && !cros->wimax_connected()) {
     std::string deal_text;
     int carrier_deal_promo_pref = kNotificationCountPrefDefault;
     const MobileConfig::CarrierDeal* deal = NULL;
diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
index ca1889a..e98e0de 100644
--- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
@@ -58,6 +58,7 @@ const char kMachineInfoSerialNumber[] = "serial_number";
 // Types of network connection.
 const char kConnectionEthernet[] = "ethernet";
 const char kConnectionWifi[] = "wifi";
+const char kConnectionWimax[] = "wimax";
 const char kConnection3g[] = "3g";
 const char kUndefinedValue[] = "undefined";
 
@@ -77,6 +78,8 @@ static std::string GetConnectionType() {
     return kConnectionWifi;
   else if (network_lib->cellular_connected())
     return kConnection3g;
+  else if (network_lib->wimax_connected())
+    return kConnectionWimax;
   // Connection might have been lost and is in reconnecting state at this point.
   else if (network_lib->ethernet_connecting())
     return kConnectionEthernet;
@@ -84,6 +87,8 @@ static std::string GetConnectionType() {
     return kConnectionWifi;
   else if (network_lib->cellular_connecting())
     return kConnection3g;
+  else if (network_lib->wimax_connecting())
+    return kConnectionWimax;
   else
     return kUndefinedValue;
 }