Merged Tether and cellular network types in System Tray.

ash/system/network/network_info.h

 // Copyright 2014 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_INFO_H_
 #define ASH_SYSTEM_NETWORK_NETWORK_INFO_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace ash {
 
 // Includes information necessary about a network for displaying the appropriate
 // UI to the user.
 struct NetworkInfo {
-  enum class Type { UNKNOWN, WIFI, TETHER, CELLULAR };
+  enum class Type { UNKNOWN, WIFI, CELLULAR };

[stevenjb, 2017/05/23 22:11:07]

Let's change 'CELLULAR' to 'MOBILE' to reflect that it represents both Cellular
and Tether.

[Ryan Hansberry, 2017/05/27 00:16:22]

Ping.

[lesliewatkins, 2017/05/30 18:29:51]

Done.

 
   NetworkInfo();
   NetworkInfo(const std::string& guid);
   ~NetworkInfo();
 
   bool operator==(const NetworkInfo& other) const;
   bool operator!=(const NetworkInfo& other) const { return !(*this == other); }
 
   std::string guid;
   base::string16 label;
   base::string16 tooltip;
   gfx::ImageSkia image;
   bool disable;
   bool connected;
   bool connecting;
   Type type;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_NETWORK_NETWORK_INFO_H_