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

 // Copyright 2016 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/network/network_list.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/public/cpp/config.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon.h"
 #include "ash/system/network/network_icon_animation.h"
 #include "ash/system/network/network_info.h"
 #include "ash/system/network/network_state_list_detailed_view.h"
 #include "ash/system/networking_config_delegate.h"
 #include "ash/system/power/power_status.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_menu_button.h"
 #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"
 #include "base/i18n/number_formatting.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
@@ skipping 587 matching lines @@
     // No re-order and re-layout is necessary if |view| is already at |index|.
     if (scroll_content()->child_at(index) == view)
       return;
     scroll_content()->ReorderChildView(view, index);
   }
   needs_relayout_ = true;
 }
 
 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;
       delete info_label;
       *info_label_ptr = nullptr;
     }
     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,
                                             bool enabled,
                                             int child_index,
                                             SectionHeaderRowView** view,
                                             views::Separator** separator_view) {
   if (!*view) {
     if (pattern.MatchesPattern(NetworkTypePattern::Mobile()))
       *view = new MobileHeaderRowView();
     else if (pattern.Equals(NetworkTypePattern::WiFi()))
       *view = new WifiHeaderRowView();
@@ skipping 59 matching lines @@
       TriView::Container::CENTER, views::CreateEmptyBorder(gfx::Insets(
                                       0, 0, 0, kTrayPopupLabelRightPadding)));
 
   // Nothing to the right of the text.
   connection_warning->SetContainerVisible(TriView::Container::END, false);
   return connection_warning;
 }
 
 }  // namespace tray
 }  // namespace ash