Merged Tether and cellular network types in System Tray.

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>
@@ skipping 103 matching lines @@
   // 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_;
 
   InfoLabel* no_wifi_networks_view_;
-  InfoLabel* no_cellular_networks_view_;
-  SectionHeaderRowView* cellular_header_view_;
-  SectionHeaderRowView* tether_header_view_;
+  InfoLabel* no_mobile_networks_view_;
+  SectionHeaderRowView* mobile_header_view_;
   SectionHeaderRowView* wifi_header_view_;
-  views::Separator* cellular_separator_view_;
-  views::Separator* tether_separator_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_