[Ash] Remove HoverHighlightView::AddLabelDeprecated()

ash/system/bluetooth/tray_bluetooth.cc

 // Copyright (c) 2012 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/bluetooth/tray_bluetooth.h"
 
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 270 matching lines @@
 
     // If Bluetooth is disabled, show a panel which only indicates that it is
     // disabled, instead of the scroller with Bluetooth devices.
     if (bluetooth_enabled) {
       HideDisabledPanel();
     } else {
       ShowDisabledPanel();
       return;
     }
 
-    // Add paired devices (and their section header in MD) in the list.
+    // Add paired devices and their section header to the list.
     size_t num_paired_devices = connected_devices_.size() +
                                 connecting_devices_.size() +
                                 paired_not_connected_devices_.size();
     if (num_paired_devices > 0) {
       AddSubHeader(IDS_ASH_STATUS_TRAY_BLUETOOTH_PAIRED_DEVICES);
       AppendSameTypeDevicesToScrollList(connected_devices_, true, true,
                                         bluetooth_enabled);
       AppendSameTypeDevicesToScrollList(connecting_devices_, true, false,
                                         bluetooth_enabled);
       AppendSameTypeDevicesToScrollList(paired_not_connected_devices_, false,
                                         false, bluetooth_enabled);
     }
 
-    // Add paired devices (and their section header in MD) in the list.
+    // Add unpaired devices to the list. If at least one paired device is
+    // present, also add a section header above the unpaired devices.
     if (discovered_not_paired_devices_.size() > 0) {
       if (num_paired_devices > 0)
         AddSubHeader(IDS_ASH_STATUS_TRAY_BLUETOOTH_UNPAIRED_DEVICES);
       AppendSameTypeDevicesToScrollList(discovered_not_paired_devices_, false,
                                         false, bluetooth_enabled);
     }
 
     // Show user Bluetooth state if there is no bluetooth devices in list.
-    if (device_map_.size() == 0) {
-      if (bluetooth_available && bluetooth_enabled) {
-        HoverHighlightView* container = new HoverHighlightView(this);
-        container->AddLabelDeprecated(
-            l10n_util::GetStringUTF16(
-                IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERING),
-            gfx::ALIGN_LEFT, false);
-        scroll_content()->AddChildView(container);
-      }
+    if (device_map_.size() == 0 && bluetooth_available && bluetooth_enabled) {
+      scroll_content()->AddChildView(TrayPopupUtils::CreateInfoLabelRowView(
+          IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERING));
     }
 
     // Focus the device which was focused before the device-list update.
     if (!focused_device_address.empty())
       FocusDeviceByAddress(focused_device_address);
 
     scroll_content()->InvalidateLayout();
   }
 
   void AppendSameTypeDevicesToScrollList(const BluetoothDeviceList& list,
@@ skipping 314 matching lines @@
     detailed_->Update();
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace ash