Replace 'Scanning' text in Network Status Area with throbber

ash/system/tray/special_popup_row.cc

 // Copyright (c) 2013 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 "ash/system/tray/special_popup_row.h"
 
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/throbber_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_header_button.h"
@@ skipping 64 matching lines @@
       rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_PREVIOUS_MENU));
   SetContent(container);
 }
 
 void SpecialPopupRow::SetContent(views::View* view) {
   CHECK(!content_);
   content_ = view;
   AddChildViewAt(content_, 0);
 }
 
-void SpecialPopupRow::AddButton(TrayPopupHeaderButton* button) {
+void SpecialPopupRow::AddView(views::View* view, bool add_separator) {
   if (!button_container_) {
     button_container_ = CreatePopupHeaderButtonsContainer();
     AddChildView(button_container_);
   }
-  views::Separator* separator =
-      new views::Separator(views::Separator::VERTICAL);
-  separator->SetColor(ash::kBorderDarkColor);
-  separator->SetBorder(
-      views::Border::CreateEmptyBorder(kSeparatorInset, 0, kSeparatorInset, 0));
-  button_container_->AddChildView(separator);
-  button_container_->AddChildView(button);
+  if (add_separator) {
+    views::Separator* separator =
+        new views::Separator(views::Separator::VERTICAL);
+    separator->SetColor(ash::kBorderDarkColor);
+    separator->SetBorder(views::Border::CreateEmptyBorder(kSeparatorInset, 0,
+                                                          kSeparatorInset, 0));
+    button_container_->AddChildView(separator);
+  }
+  button_container_->AddChildView(view);
 }
 
-void SpecialPopupRow::AddThrobber(ThrobberView* throbber) {
-  if (!button_container_) {
-    button_container_ = CreatePopupHeaderButtonsContainer();
-    AddChildView(button_container_);
-  }
-  button_container_->AddChildView(throbber);
+void SpecialPopupRow::AddButton(TrayPopupHeaderButton* button) {
+  AddView(button, true /* add_separator */);
 }
 
 gfx::Size SpecialPopupRow::GetPreferredSize() const {
   gfx::Size size = views::View::GetPreferredSize();
   size.set_height(kSpecialPopupRowHeight);
   return size;
 }
 
 int SpecialPopupRow::GetHeightForWidth(int width) const {
   return kSpecialPopupRowHeight;
@@ skipping 15 matching lines @@
   container_bounds.ClampToCenteredSize(bounds.size());
   container_bounds.set_x(content_bounds.width() - container_bounds.width());
   button_container_->SetBoundsRect(container_bounds);
 
   bounds = content_->bounds();
   bounds.set_width(button_container_->x());
   content_->SetBoundsRect(bounds);
 }
 
 }  // namespace ash