Revert 64888 - Push for ers:...

chrome/browser/chromeos/status/network_dropdown_button.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/status/network_dropdown_button.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 16 matching lines @@
                                              gfx::NativeWindow parent_window)
     : MenuButton(NULL,
                  l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
                  this,
                  true),
       browser_mode_(browser_mode),
       ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)),
       parent_window_(parent_window) {
   animation_connecting_.SetThrobDuration(kThrobDuration);
   animation_connecting_.SetTweenType(Tween::LINEAR);
-  OnNetworkManagerChanged(CrosLibrary::Get()->GetNetworkLibrary());
-  CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
+  NetworkChanged(CrosLibrary::Get()->GetNetworkLibrary());
+  CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(this);
 }
 
 NetworkDropdownButton::~NetworkDropdownButton() {
-  CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
+  CrosLibrary::Get()->GetNetworkLibrary()->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, AnimationDelegate implementation:
 
 void NetworkDropdownButton::AnimationProgressed(const Animation* animation) {
   if (animation == &animation_connecting_) {
     // Figure out which image to draw. We want a value between 0-100.
     // 0 represents no signal and 100 represents full signal strength.
     int value = static_cast<int>(animation_connecting_.GetCurrentValue()*100.0);
     if (value < 0)
       value = 0;
     else if (value > 100)
       value = 100;
     SetIcon(IconForNetworkStrength(value, true));
     SchedulePaint();
   } else {
     MenuButton::AnimationProgressed(animation);
   }
 }
 
 void NetworkDropdownButton::Refresh() {
-  OnNetworkManagerChanged(CrosLibrary::Get()->GetNetworkLibrary());
+  NetworkChanged(CrosLibrary::Get()->GetNetworkLibrary());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NetworkDropdownButton, NetworkLibrary::NetworkManagerObserver implementation:
+// NetworkDropdownButton, NetworkLibrary::Observer implementation:
 
-void NetworkDropdownButton::OnNetworkManagerChanged(NetworkLibrary* cros) {
+void NetworkDropdownButton::NetworkChanged(NetworkLibrary* cros) {
   // Show network that we will actually use. It could be another network than
   // user selected. For example user selected WiFi network but we have Ethernet
   // connection and Chrome OS device will actually use Ethernet.
 
   // This gets called on initialization, so any changes should be reflected
   // in CrosMock::SetNetworkLibraryStatusAreaExpectations().
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (CrosLibrary::Get()->EnsureLoaded()) {
-    // Always show the active network, if any
-    const Network* active_network = cros->active_network();
-    const WirelessNetwork* wireless;
-    if (active_network != NULL) {
+    // Always show the higher priority connection first. Ethernet then wifi.
+    if (cros->ethernet_connected()) {
       animation_connecting_.Stop();
-      if (active_network->type() == TYPE_ETHERNET) {
-        SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
-        SetText(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
-      } else {
-        DCHECK(active_network->type() == TYPE_WIFI ||
-               active_network->type() == TYPE_CELLULAR);
-        wireless = static_cast<const WirelessNetwork*>(active_network);
-        SetIcon(IconForNetworkStrength(wireless->strength(), false));
-        SetText(ASCIIToWide(wireless->name()));
-      }
+      SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
+      SetText(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
+    } else if (cros->wifi_connected()) {
+      animation_connecting_.Stop();
+      SetIcon(IconForNetworkStrength(
+          cros->wifi_network()->strength(), true));
+      SetText(ASCIIToWide(cros->wifi_network()->name()));
+    } else if (cros->cellular_connected()) {
+      animation_connecting_.Stop();
+      SetIcon(IconForNetworkStrength(
+          cros->cellular_network()->strength(), false));
+      SetText(ASCIIToWide(cros->cellular_network()->name()));
     } else if (cros->wifi_connecting() || cros->cellular_connecting()) {
       if (!animation_connecting_.is_animating()) {
         animation_connecting_.Reset();
         animation_connecting_.StartThrobbing(-1);
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS1_BLACK));
       }
+
       if (cros->wifi_connecting())
         SetText(ASCIIToWide(cros->wifi_network()->name()));
       else if (cros->cellular_connecting())
         SetText(ASCIIToWide(cros->cellular_network()->name()));
     }
 
     if (!cros->Connected() && !cros->Connecting()) {
       animation_connecting_.Stop();
       SetIcon(SkBitmap());
       SetText(l10n_util::GetString(IDS_NETWORK_SELECTION_NONE));
     }
   } else {
     animation_connecting_.Stop();
     SetIcon(SkBitmap());
     SetText(l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE));
   }
 
   SchedulePaint();
 }
 
 }  // namespace chromeos