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

ash/system/network/network_list.h

 // 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.
 
 #ifndef ASH_SYSTEM_NETWORK_NETWORK_LIST_H_
 #define ASH_SYSTEM_NETWORK_NETWORK_LIST_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "ash/system/network/network_icon_animation_observer.h"
 #include "ash/system/network/network_info.h"
 #include "ash/system/network/network_state_list_detailed_view.h"
-#include "ash/system/tray/tray_info_label.h"
 #include "base/macros.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_type_pattern.h"
 
 namespace views {
 class Separator;
 class View;
 }
 
 namespace ash {
 class HoverHighlightView;
 class TriView;
 
 namespace tray {
 
 // A list of available networks of a given type. This class is used for all
 // network types except VPNs. For VPNs, see the |VPNList| class.
 class NetworkListView : public NetworkStateListDetailedView,
-                        public network_icon::AnimationObserver,
-                        public TrayInfoLabel::Delegate {
+                        public network_icon::AnimationObserver {
  public:
   class SectionHeaderRowView;
 
   NetworkListView(SystemTrayItem* owner, LoginStatus login);
   ~NetworkListView() override;
 
   // NetworkStateListDetailedView:
   void UpdateNetworkList() override;
   bool IsNetworkEntry(views::View* view, std::string* guid) const override;
 
@@ skipping 51 matching lines @@
   void PlaceViewAtIndex(views::View* view, int index);
 
   // Creates an info label with text specified by |message_id| and adds it to
   // |scroll_content()| if necessary or updates the text and reorders the
   // |scroll_content()| placing the info label at |insertion_index|. When
   // |message_id| is zero removes the |*info_label_ptr| from the
   // |scroll_content()| and destroys it. |info_label_ptr| is an in/out parameter
   // and is only modified if the info label is created or destroyed.
   void UpdateInfoLabel(int message_id,
                        int insertion_index,
-                       TrayInfoLabel** info_label_ptr);
+                       InfoLabel** info_label_ptr);
 
   // Creates a cellular/tether/Wi-Fi header row |view| and adds it to
   // |scroll_content()| if necessary and reorders the |scroll_content()| placing
   // the |view| at |child_index|. Returns the index where the next child should
   // be inserted, i.e., the index directly after the last inserted child.
   int UpdateSectionHeaderRow(chromeos::NetworkTypePattern pattern,
                              bool enabled,
                              int child_index,
                              SectionHeaderRowView** view,
                              views::Separator** separator_view);
 
-  // TrayInfoLabel::Delegate:
-  void OnLabelClicked(int message_id) override;
-  bool IsLabelClickable(int message_id) const override;
-
   // network_icon::AnimationObserver:
   void NetworkIconChanged() override;
 
   // Returns true if the info should be updated to the view for network,
   // otherwise false.
   bool NeedUpdateViewForNetwork(const NetworkInfo& info) const;
 
   bool needs_relayout_;
 
-  TrayInfoLabel* no_wifi_networks_view_;
-  TrayInfoLabel* no_mobile_networks_view_;
+  InfoLabel* no_wifi_networks_view_;
+  InfoLabel* no_mobile_networks_view_;
   SectionHeaderRowView* mobile_header_view_;
   SectionHeaderRowView* wifi_header_view_;
   views::Separator* mobile_separator_view_;
   views::Separator* wifi_separator_view_;
   TriView* connection_warning_;
 
   // An owned list of network info.
   std::vector<std::unique_ptr<NetworkInfo>> network_list_;
 
   using NetworkMap = std::map<views::View*, std::string>;
   NetworkMap network_map_;
 
   // A map of network guids to their view.
   using NetworkGuidMap = std::map<std::string, HoverHighlightView*>;
   NetworkGuidMap network_guid_map_;
 
   // Save a map of network guids to their infos against current |network_list_|.
   using NetworkInfoMap = std::map<std::string, std::unique_ptr<NetworkInfo>>;
   NetworkInfoMap last_network_info_map_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkListView);
 };
 
 }  // namespace tray
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_NETWORK_NETWORK_LIST_H_