diff options
6 files changed, 41 insertions, 29 deletions
diff --git a/chrome/browser/chromeos/cros/native_network_parser.cc b/chrome/browser/chromeos/cros/native_network_parser.cc index fd8df5e..f063ed5 100644 --- a/chrome/browser/chromeos/cros/native_network_parser.cc +++ b/chrome/browser/chromeos/cros/native_network_parser.cc @@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/cros/native_network_parser.h" #include "base/stringprintf.h" +#include "base/values.h" #include "chrome/browser/chromeos/cros/native_network_constants.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/chromeos/cros/native_network_parser.h b/chrome/browser/chromeos/cros/native_network_parser.h index eee1384..bedbe91 100644 --- a/chrome/browser/chromeos/cros/native_network_parser.h +++ b/chrome/browser/chromeos/cros/native_network_parser.h @@ -9,6 +9,12 @@ #include "chrome/browser/chromeos/cros/network_parser.h" #include "base/compiler_specific.h" // for OVERRIDE +namespace base { +class DictionaryValue; +class ListValue; +class Value; +} + namespace chromeos { // This is the network device parser that parses the data from the @@ -19,19 +25,21 @@ class NativeNetworkDeviceParser : public NetworkDeviceParser { NativeNetworkDeviceParser(); virtual ~NativeNetworkDeviceParser(); virtual bool ParseValue(PropertyIndex index, - const Value& value, + const base::Value& value, NetworkDevice* device) OVERRIDE; protected: virtual ConnectionType ParseType(const std::string& type) OVERRIDE; // Parsing helper routines specific to native network devices. - virtual bool ParseApnList(const ListValue& list, CellularApnList* apn_list); - virtual bool ParseFoundNetworksFromList(const ListValue& list, + virtual bool ParseApnList(const base::ListValue& list, + CellularApnList* apn_list); + virtual bool ParseFoundNetworksFromList(const base::ListValue& list, CellularNetworkList* found_networks); virtual SimLockState ParseSimLockState(const std::string& state); - virtual bool ParseSimLockStateFromDictionary(const DictionaryValue& info, - SimLockState* out_state, - int* out_retries); + virtual bool ParseSimLockStateFromDictionary( + const base::DictionaryValue& info, + SimLockState* out_state, + int* out_retries); virtual TechnologyFamily ParseTechnologyFamily( const std::string& technology_family); @@ -50,11 +58,11 @@ class NativeNetworkParser : public NetworkParser { static const ConnectionType ParseConnectionType(const std::string& type); protected: virtual bool ParseValue(PropertyIndex index, - const Value& value, + const base::Value& value, Network* network) OVERRIDE; virtual ConnectionType ParseType(const std::string& type) OVERRIDE; virtual ConnectionType ParseTypeFromDictionary( - const DictionaryValue& info) OVERRIDE; + const base::DictionaryValue& info) OVERRIDE; virtual ConnectionMode ParseMode(const std::string& mode) OVERRIDE; virtual ConnectionState ParseState(const std::string& state) OVERRIDE; virtual ConnectionError ParseError(const std::string& error) OVERRIDE; @@ -79,7 +87,7 @@ class NativeWirelessNetworkParser : public NativeNetworkParser { NativeWirelessNetworkParser(); virtual ~NativeWirelessNetworkParser(); virtual bool ParseValue(PropertyIndex index, - const Value& value, + const base::Value& value, Network* network) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(NativeWirelessNetworkParser); @@ -90,7 +98,7 @@ class NativeWifiNetworkParser : public NativeWirelessNetworkParser { NativeWifiNetworkParser(); virtual ~NativeWifiNetworkParser(); virtual bool ParseValue(PropertyIndex index, - const Value& value, + const base::Value& value, Network* network) OVERRIDE; protected: ConnectionSecurity ParseSecurity(const std::string& security); @@ -105,7 +113,7 @@ class NativeCellularNetworkParser : public NativeWirelessNetworkParser { NativeCellularNetworkParser(); virtual ~NativeCellularNetworkParser(); virtual bool ParseValue(PropertyIndex index, - const Value& value, + const base::Value& value, Network* network) OVERRIDE; protected: ActivationState ParseActivationState(const std::string& state); @@ -122,13 +130,13 @@ class NativeVirtualNetworkParser : public NativeNetworkParser { NativeVirtualNetworkParser(); virtual ~NativeVirtualNetworkParser(); virtual bool ParseValue(PropertyIndex index, - const Value& value, + const base::Value& value, Network* network) OVERRIDE; - virtual bool UpdateNetworkFromInfo(const DictionaryValue& info, + virtual bool UpdateNetworkFromInfo(const base::DictionaryValue& info, Network* network) OVERRIDE; protected: bool ParseProviderValue(PropertyIndex index, - const Value& value, + const base::Value& value, VirtualNetwork* network); ProviderType ParseProviderType(const std::string& type); private: diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h index b4a9787..baf3de8 100644 --- a/chrome/browser/chromeos/cros/network_library.h +++ b/chrome/browser/chromeos/cros/network_library.h @@ -336,7 +336,7 @@ struct CellularApn { CellularApn(const std::string& apn, const std::string& network_id, const std::string& username, const std::string& password); ~CellularApn(); - void Set(const DictionaryValue& dict); + void Set(const base::DictionaryValue& dict); }; typedef std::vector<CellularApn> CellularApnList; @@ -413,7 +413,7 @@ class NetworkDevice { // PropertyIndex that was updated in |index|. |index| may be NULL // if not needed. bool UpdateStatus(const std::string& key, - const Value& value, + const base::Value& value, PropertyIndex *index); NativeNetworkDeviceParser* device_parser() { return device_parser_.get(); } @@ -635,7 +635,7 @@ class Network { } virtual bool UpdateStatus(const std::string& key, - const Value& value, + const base::Value& value, PropertyIndex* index); protected: @@ -996,8 +996,8 @@ class CellularNetwork : public WirelessNetwork { } void set_usage_url(const std::string& usage_url) { usage_url_ = usage_url; } void set_data_left(DataLeft data_left) { data_left_ = data_left; } - void set_apn(const DictionaryValue& apn) { apn_.Set(apn); } - void set_last_good_apn(const DictionaryValue& last_good_apn) { + void set_apn(const base::DictionaryValue& apn) { apn_.Set(apn); } + void set_last_good_apn(const base::DictionaryValue& last_good_apn) { last_good_apn_.Set(last_good_apn); } diff --git a/chrome/browser/chromeos/cros/network_parser.cc b/chrome/browser/chromeos/cros/network_parser.cc index 5d3dfd4..fa9d7c0 100644 --- a/chrome/browser/chromeos/cros/network_parser.cc +++ b/chrome/browser/chromeos/cros/network_parser.cc @@ -6,6 +6,7 @@ #include "base/json/json_writer.h" // for debug output only. #include "base/stringprintf.h" +#include "base/values.h" // Needed only for debug output (ConnectionTypeToString). #include "chrome/browser/chromeos/cros/native_network_constants.h" diff --git a/chrome/browser/chromeos/cros/network_parser.h b/chrome/browser/chromeos/cros/network_parser.h index 9181551..748a587 100644 --- a/chrome/browser/chromeos/cros/network_parser.h +++ b/chrome/browser/chromeos/cros/network_parser.h @@ -78,12 +78,13 @@ class EnumMapper { // policy or setup file import depending on the EnumMapper supplied. class NetworkDeviceParser { public: - virtual NetworkDevice* CreateDeviceFromInfo(const std::string& device_path, - const DictionaryValue& info); - virtual bool UpdateDeviceFromInfo(const DictionaryValue& info, + virtual NetworkDevice* CreateDeviceFromInfo( + const std::string& device_path, + const base::DictionaryValue& info); + virtual bool UpdateDeviceFromInfo(const base::DictionaryValue& info, NetworkDevice* device); virtual bool UpdateStatus(const std::string& key, - const Value& value, + const base::Value& value, NetworkDevice* device, PropertyIndex* index); protected: @@ -92,7 +93,7 @@ class NetworkDeviceParser { virtual ~NetworkDeviceParser(); virtual bool ParseValue(PropertyIndex index, - const Value& value, + const base::Value& value, NetworkDevice* device) = 0; virtual ConnectionType ParseType(const std::string& type) = 0; @@ -113,11 +114,11 @@ class NetworkParser { public: // Called when a new network is encountered. Returns NULL upon failure. virtual Network* CreateNetworkFromInfo(const std::string& service_path, - const DictionaryValue& info); + const base::DictionaryValue& info); // Called when an existing network is has new information that needs // to be updated. Returns false upon failure. - virtual bool UpdateNetworkFromInfo(const DictionaryValue& info, + virtual bool UpdateNetworkFromInfo(const base::DictionaryValue& info, Network* network); // Called when an individual attribute of an existing network has @@ -125,7 +126,7 @@ class NetworkParser { // property index for the given key. |index| is filled in even if // the update fails. Returns false upon failure. virtual bool UpdateStatus(const std::string& key, - const Value& value, + const base::Value& value, Network* network, PropertyIndex* index); protected: @@ -134,11 +135,11 @@ class NetworkParser { virtual ~NetworkParser(); virtual bool ParseValue(PropertyIndex index, - const Value& value, + const base::Value& value, Network* network) = 0; virtual ConnectionType ParseType(const std::string& type) = 0; virtual ConnectionType ParseTypeFromDictionary( - const DictionaryValue& info) = 0; + const base::DictionaryValue& info) = 0; virtual ConnectionMode ParseMode(const std::string& mode) = 0; virtual ConnectionState ParseState(const std::string& state) = 0; virtual ConnectionError ParseError(const std::string& error) = 0; diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc index 4c6d143..fcfa5a4 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/values.h" #include "content/browser/webui/web_ui.h" #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" #include "chrome/browser/chromeos/cros/cros_library.h" |