Revert of Add a row in the network tray to inform users to turn Bluetooth on to enable Tether.

ash/system/network/network_list.cc

Index: ash/system/network/network_list.cc
diff --git a/ash/system/network/network_list.cc b/ash/system/network/network_list.cc
index 40dd9a091fa7c2bc5c14a95dcfb11444ed1c2baf..9ed47151bdadd73493461f693f89e7b1972e9aa5 100644
--- a/ash/system/network/network_list.cc
+++ b/ash/system/network/network_list.cc
@@ -23,7 +23,6 @@
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_info_label.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
@@ -631,8 +630,8 @@
 
 void NetworkListView::UpdateInfoLabel(int message_id,
                                       int insertion_index,
-                                      TrayInfoLabel** info_label_ptr) {
-  TrayInfoLabel* info_label = *info_label_ptr;
+                                      InfoLabel** info_label_ptr) {
+  InfoLabel* info_label = *info_label_ptr;
   if (!message_id) {
     if (info_label) {
       needs_relayout_ = true;
@@ -642,21 +641,11 @@
     return;
   }
   if (!info_label)
-    info_label = new TrayInfoLabel(this /* delegate */, message_id);
+    info_label = new InfoLabel(message_id);
   else
-    info_label->Update(message_id);
-
+    info_label->SetMessage(message_id);
   PlaceViewAtIndex(info_label, insertion_index);
   *info_label_ptr = info_label;
-}
-
-void NetworkListView::OnLabelClicked(int message_id) {
-  if (message_id == IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH)
-    Shell::Get()->system_tray_controller()->ShowBluetoothSettings();
-}
-
-bool NetworkListView::IsLabelClickable(int message_id) const {
-  return message_id == IDS_ASH_STATUS_TRAY_ENABLE_BLUETOOTH;
 }
 
 int NetworkListView::UpdateSectionHeaderRow(NetworkTypePattern pattern,