Replace 'Scanning' text in Network Status Area with throbber

ui/chromeos/network/network_list.cc

 // Copyright 2014 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 "ui/chromeos/network/network_list.h"
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/network/network_state.h"
@@ skipping 13 matching lines @@
 using chromeos::NetworkHandler;
 using chromeos::NetworkStateHandler;
 using chromeos::NetworkTypePattern;
 
 namespace ui {
 
 // NetworkListView:
 
 NetworkListView::NetworkListView(NetworkListDelegate* delegate)
     : delegate_(delegate),
-      scanning_view_(NULL),
       no_wifi_networks_view_(NULL),
       no_cellular_networks_view_(NULL) {
   CHECK(delegate_);
 }
 
 NetworkListView::~NetworkListView() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
 
 void NetworkListView::Update() {
@@ skipping 140 matching lines @@
     int message_id = 0;
     if (network_list_.empty()) {
       message_id = handler->IsTechnologyEnabled(NetworkTypePattern::WiFi())
                        ? IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED
                        : IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED;
     }
     needs_relayout |=
         UpdateInfoLabel(message_id, index, &no_wifi_networks_view_);
     if (message_id)
       ++index;
-
-    // "Wifi Scanning"
-    message_id = 0;
-    if (handler->GetScanningByType(NetworkTypePattern::WiFi()))
-      message_id = IDS_ASH_STATUS_TRAY_WIFI_SCANNING_MESSAGE;
-    needs_relayout |= UpdateInfoLabel(message_id, index, &scanning_view_);
-    if (message_id)
-      ++index;
   }
 
   // Un-highlighted networks
   needs_relayout |= UpdateNetworkChildren(new_service_paths, &index,
                                           false /* not highlighted */);
 
   // No networks or other messages (fallback)
   if (index == 0) {
     needs_relayout |= UpdateInfoLabel(IDS_ASH_STATUS_TRAY_NO_NETWORKS, index,
-                                      &scanning_view_);
+                                      &no_wifi_networks_view_);
   }
 
   return needs_relayout;
 }
 
 bool NetworkListView::UpdateNetworkChildren(
     std::set<std::string>* new_service_paths,
     int* child_index,
     bool highlighted) {
   bool needs_relayout = false;
@@ skipping 63 matching lines @@
     needs_relayout = true;
   }
   return needs_relayout;
 }
 
 void NetworkListView::NetworkIconChanged() {
   Update();
 }
 
 }  // namespace ui