Treat tethered networks as mobile networks

chromeos/network/network_state.h

 // Copyright (c) 2012 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 CHROMEOS_NETWORK_NETWORK_STATE_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 82 matching lines @@
 
   // Cellular property accessors
   const std::string& network_technology() const {
     return network_technology_;
   }
   const std::string& activation_type() const { return activation_type_; }
   const std::string& activation_state() const { return activation_state_; }
   const std::string& roaming() const { return roaming_; }
   const std::string& payment_url() const { return payment_url_; }
   bool cellular_out_of_credits() const { return cellular_out_of_credits_; }
+  const std::string& tethering_state() const { return tethering_state_; }
 
   // VPN property accessors
   const std::string& vpn_provider_type() const { return vpn_provider_type_; }
   const std::string& third_party_vpn_provider_extension_id() const {
     return third_party_vpn_provider_extension_id_;
   }
 
   // Tether accessors and setters.
   int battery_percentage() const { return battery_percentage_; }
   void set_battery_percentage(int battery_percentage) {
     battery_percentage_ = battery_percentage;
   }
   const std::string& carrier() const { return carrier_; }
   void set_carrier(const std::string& carrier) { carrier_ = carrier; }
   bool tether_has_connected_to_host() const {
     return tether_has_connected_to_host_;
   }
   void set_tether_has_connected_to_host(bool tether_has_connected_to_host) {
     tether_has_connected_to_host_ = tether_has_connected_to_host;
   }
   const std::string& tether_guid() const { return tether_guid_; }
   void set_tether_guid(const std::string& guid) { tether_guid_ = guid; }
 
+  // Returns true if current connection is using mobile data.
+  bool IsUsingMobileData() const;
+
   // Returns true if the network securty is WEP_8021x (Dynamic WEP)
   bool IsDynamicWep() const;
 
   // Returns true if |connection_state_| is a connected/connecting state.
   bool IsConnectedState() const;
   bool IsConnectingState() const;
 
   // Returns true if |last_connection_state_| is connected, and
   // |connection_state_| is connecting.
   bool IsReconnecting() const;
@@ skipping 83 matching lines @@
   std::string bssid_;  // For ARC
   int frequency_ = 0;  // For ARC
 
   // Cellular properties, used for icons, Connect, and Activation.
   std::string network_technology_;
   std::string activation_type_;
   std::string activation_state_;
   std::string roaming_;
   std::string payment_url_;
   bool cellular_out_of_credits_ = false;
+  std::string tethering_state_;
 
   // VPN properties, used to construct the display name and to show the correct
   // configuration dialog.
   std::string vpn_provider_type_;
   std::string third_party_vpn_provider_extension_id_;
 
   // Tether properties.
   std::string carrier_;
   int battery_percentage_;
+
   // Whether the current device has already connected to the tether host device
   // providing the hotspot corresponding to this NetworkState.
   // Note: this means that the current device has already connected to the
   // tether host, but it does not necessarily mean that the current device has
   // connected to the Tether network corresponding to this NetworkState.
   bool tether_has_connected_to_host_;
 
   // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler
   // provides proxy configuration. crbug.com/241775
   base::DictionaryValue proxy_config_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_H_