Add support for cellular geolocation

chromeos/network/network_util.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_UTIL_H_
 #define CHROMEOS_NETWORK_NETWORK_UTIL_H_
 
 // This header is introduced to make it easy to switch from chromeos_network.cc
 // to Chrome's own DBus code.  crosbug.com/16557
 // All calls to functions in chromeos_network.h should be made through
@@ skipping 25 matching lines @@
   WifiAccessPoint(const WifiAccessPoint& other);
   ~WifiAccessPoint();
   std::string ssid;  // The ssid of the WiFi node if available.
   std::string mac_address;  // The mac address of the WiFi node.
   base::Time timestamp;  // Timestamp when this AP was detected.
   int signal_strength;  // Radio signal strength measured in dBm.
   int signal_to_noise;  // Current signal to noise ratio measured in dB.
   int channel;  // Wifi channel number.
 };
 
+// Struct for passing cellular location data
+// The age, signalStrength, and timingAdvance fields are currently unused:
+// https://developers.google.com/maps/documentation/geolocation/intro#cell_tower_object
+struct CHROMEOS_EXPORT CellTower {
+  CellTower();
+  CellTower(const CellTower& other);
+  ~CellTower();
+  std::string mcc;       // The mobile country code if available
+  std::string mnc;       // The mobile network code if available
+  std::string lac;       // The location area code if available
+  std::string ci;        // The cell id if availabe
+  base::Time timestamp;  // Timestamp when this location was detected.
+};
+
 // Struct for passing network scan result data.
 struct CHROMEOS_EXPORT CellularScanResult {
   CellularScanResult();
   CellularScanResult(const CellularScanResult& other);
   ~CellularScanResult();
   std::string status;  // The network's availability status. (One of "unknown",
                        // "available", "current", or "forbidden")
   std::string network_id;  // 3GPP operator code ("MCCMNC").
   std::string short_name;  // Short-format name of the operator.
   std::string long_name;  // Long-format name of the operator.
   std::string technology;  // Access technology.
 };
 
 typedef std::vector<WifiAccessPoint> WifiAccessPointVector;
+typedef std::vector<CellTower> CellTowerVector;
 
 // Describes whether there is an error and whether the error came from
 // the local system or from the server implementing the connect
 // method.
 enum NetworkMethodErrorType {
   NETWORK_METHOD_ERROR_NONE = 0,
   NETWORK_METHOD_ERROR_LOCAL = 1,
   NETWORK_METHOD_ERROR_REMOTE = 2,
 };
 
@@ skipping 45 matching lines @@
 // there is no match. Only valid for ethernet, wifi, wimax, cellular, and vpn.
 CHROMEOS_EXPORT std::string TranslateONCTypeToShill(const std::string& type);
 
 // Inverse of TranslateONCTypeToShill.
 CHROMEOS_EXPORT std::string TranslateShillTypeToONC(const std::string& type);
 
 }  // namespace network_util
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_UTIL_H_