diff options
Diffstat (limited to 'chrome/browser')
3 files changed, 246 insertions, 137 deletions
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.html b/chrome/browser/resources/options/chromeos/internet_detail.html index ec541b2..dd939e8 100644 --- a/chrome/browser/resources/options/chromeos/internet_detail.html +++ b/chrome/browser/resources/options/chromeos/internet_detail.html @@ -74,8 +74,8 @@ <label for="prefer-network-wifi" i18n-content="inetPreferredNetwork"> </label> - <span class="controlled-setting-indicator" data="preferred" - for="prefer-network-wifi"> + <span class="controlled-setting-indicator" + managed="Priority" for="prefer-network-wifi"> </span> </span> </span> @@ -224,7 +224,7 @@ <td> <input class="option-value" id="inet-server-hostname"></input> <span class="controlled-setting-indicator" - data="serverHostname" for="inet-server-hostname"></span> + managed="VPN.Host" for="inet-server-hostname"></span> </td> </tr> <tr> diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js index 7447b52..431e7d2 100644 --- a/chrome/browser/resources/options/chromeos/internet_detail.js +++ b/chrome/browser/resources/options/chromeos/internet_detail.js @@ -15,23 +15,60 @@ cr.define('options.internet', function() { /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; /** @const */ var IPAddressField = options.internet.IPAddressField; + var GetManagedTypes = { + ACTIVE: 0, + TRANSLATED: 1, + RECOMMENDED: 2 + }; + /** - * Helper function to get the "Active" value of a property from a dictionary - * that includes ONC managed properties, e.g. getActiveValue(data, 'Name'). - * We use (data, key) instead of getActiveValue(data[key]) so that we can - * (possibly) add ONC key validation once all properties use ONC. + * Gets the value of a property from a dictionary |data| that includes ONC + * managed properties, e.g. getManagedValue(data, 'Name'). See notes for + * getManagedProperty. * @param {object} data The properties dictionary. * @param {string} key The property key. - * @return {*} the property value or undefined. + * @param {string} type (Optional) The type of property to get as defined in + * GetManagedTypes: + * 'ACTIVE' (default) - gets the active value + * 'TRANSLATED' - gets the traslated or active value + * 'RECOMMENDED' - gets the recommended value + * @return {*} The property value or undefined. */ - function getActiveValue(data, key) { - if (!(key in data)) - return undefined; - var property = data[key]; + function getManagedValue(data, key, type) { + var property = getManagedProperty(data, key); if (typeof property != 'object') return property; + if (type == GetManagedTypes.RECOMMENDED) + return getRecommendedValue(property); + if (type == GetManagedTypes.TRANSLATED && 'Translated' in property) + return property['Translated']; + // Otherwise get the Active value (defalt behavior). if ('Active' in property) return property['Active']; + // If no Active value is defined, return the effective value. + return getEffectiveValue(property); + } + + /** + * Get the recommended value from a Managed property ONC dictionary. + * @param {object} property The managed property ONC dictionary. + * @return {*} the effective value or undefined. + */ + function getRecommendedValue(property) { + if (property['UserEditable']) + return property['UserPolicy']; + if (property['DeviceEditable']) + return property['DevicePolicy']; + // No value recommended by policy. + return undefined; + } + + /** + * Get the effective value from a Managed property ONC dictionary. + * @param {object} property The managed property ONC dictionary. + * @return {*} The effective value or undefined. + */ + function getEffectiveValue(property) { if ('Effective' in property) { var effective = property.Effective; if (effective in property) @@ -41,15 +78,26 @@ cr.define('options.internet', function() { } /** - * Helper function for nested ONC properties, e.g. data[WiFi][Strength]. - * @param {object|string} property The property which must ether be - * a dictionary object or not be present. - * @return {*} the property value or undefined. + * Gets either a managed property dictionary or an unmanaged value from + * dictionary |data| that includes ONC managed properties. This supports + * nested dictionaries, e.g. getManagedProperty(data, 'VPN.Type'). + * @param {object} data The properties dictionary. + * @param {string} key The property key. + * @return {*} The property value or dictionary if it exists, otherwise + * undefined. */ - function getActiveDictionaryValue(data, dict, key) { - if (!(dict in data)) - return undefined; - return getActiveValue(data[dict], key); + function getManagedProperty(data, key) { + while (true) { + var index = key.indexOf('.'); + if (index < 0) + break; + var keyComponent = key.substr(0, index); + if (!(keyComponent in data)) + return undefined; + data = data[keyComponent]; + key = key.substr(index + 1); + } + return data[key]; } /** @@ -135,7 +183,7 @@ cr.define('options.internet', function() { function getNetworkName(data) { if (data.type == 'Ethernet') return loadTimeData.getString('ethernetName'); - return getActiveValue(data, 'Name'); + return getManagedValue(data, 'Name'); } ///////////////////////////////////////////////////////////////////////////// @@ -908,7 +956,7 @@ cr.define('options.internet', function() { return; } - var connectState = getActiveValue(data, 'ConnectionState'); + var connectState = getManagedValue(data, 'ConnectionState'); if (connectState == 'NotConnected') { $('details-internet-login').hidden = false; // Connecting to an unconfigured network might trigger certificate @@ -921,7 +969,7 @@ cr.define('options.internet', function() { $('details-internet-disconnect').hidden = false; } - var connectable = getActiveValue(data, 'Connectable'); + var connectable = getManagedValue(data, 'Connectable'); if (connectState != 'Connected' && (!connectable || this.hasSecurity || (data.type == 'Wimax' || data.type == 'VPN'))) { @@ -946,7 +994,7 @@ cr.define('options.internet', function() { // Update our cached data object. updateDataObject(data, update); - var connectionState = getActiveValue(data, 'ConnectionState'); + var connectionState = getManagedValue(data, 'ConnectionState'); var connectionStateString = networkOncStateString(connectionState); detailsPage.deviceConnected = data.deviceConnected; detailsPage.connected = connectionState == 'Connected'; @@ -982,11 +1030,11 @@ cr.define('options.internet', function() { DetailsInternetPage.showDetailedInfo = function(data) { var detailsPage = DetailsInternetPage.getInstance(); - data.type = getActiveValue(data, 'Type'); // Get Active Type value. + data.type = getManagedValue(data, 'Type'); // Get Active Type value. // Populate header $('network-details-title').textContent = getNetworkName(data); - var connectionState = getActiveValue(data, 'ConnectionState'); + var connectionState = getManagedValue(data, 'ConnectionState'); var connectionStateString = networkOncStateString(connectionState); detailsPage.connected = connectionState == 'Connected'; $('network-details-subtitle-status').textContent = connectionStateString; @@ -1130,7 +1178,7 @@ cr.define('options.internet', function() { DetailsInternetPage.updateNameServerDisplay(data.nameServerType); - var macAddress = getActiveValue(data, 'MacAddress'); + var macAddress = getManagedValue(data, 'MacAddress'); if (macAddress) { $('hardware-address').textContent = macAddress; $('hardware-address-row').style.display = 'table-row'; @@ -1153,8 +1201,7 @@ cr.define('options.internet', function() { // Signal strength as percentage (for WiFi and Wimax). var signalStrength; if (data.type == 'WiFi' || data.type == 'Wimax') { - signalStrength = - getActiveDictionaryValue(data, data.type, 'SignalStrength'); + signalStrength = getManagedValue(data, data.type + '.SignalStrength'); } if (!signalStrength) signalStrength = 0; @@ -1163,21 +1210,20 @@ cr.define('options.internet', function() { detailsPage.type = data.type; if (data.type == 'WiFi') { - assert(data.WiFi, 'WiFi network has no WiFi object' + networkName); + assert('WiFi' in data, 'WiFi network has no WiFi object' + networkName); OptionsPage.showTab($('wifi-network-nav-tab')); detailsPage.gsm = false; detailsPage.shared = data.shared; $('wifi-connection-state').textContent = connectionStateString; - var ssid = getActiveDictionaryValue(data, 'WiFi', 'SSID'); + var ssid = getManagedValue(data, 'WiFi.SSID'); $('wifi-ssid').textContent = ssid ? ssid : networkName; - setOrHideParent('wifi-bssid', - getActiveDictionaryValue(data, 'WiFi', 'BSSID')); - var security = getActiveDictionaryValue(data, 'WiFi', 'Security'); + setOrHideParent('wifi-bssid', getManagedValue(data, 'WiFi.BSSID')); + var security = getManagedValue(data, 'WiFi.Security'); if (security == 'None') security = undefined; setOrHideParent('wifi-security', security); // Frequency is in MHz. - var frequency = getActiveDictionaryValue(data, 'WiFi', 'Frequency'); + var frequency = getManagedValue(data, 'WiFi.Frequency'); if (!frequency) frequency = 0; var frequencyFormat = loadTimeData.getString('inetFrequencyFormat'); @@ -1185,31 +1231,33 @@ cr.define('options.internet', function() { $('wifi-frequency').textContent = frequencyFormat; $('wifi-signal-strength').textContent = strengthString; setOrHideParent('wifi-hardware-address', - getActiveValue(data, 'MacAddress')); + getManagedValue(data, 'MacAddress')); detailsPage.showPreferred = data.remembered; - $('prefer-network-wifi').checked = data.preferred.value; + var priority = getManagedValue(data, 'Priority'); + $('prefer-network-wifi').checked = priority > 0; $('prefer-network-wifi').disabled = !data.remembered; $('auto-connect-network-wifi').checked = - getActiveValue(data, 'AutoConnect'); + getManagedValue(data, 'AutoConnect'); $('auto-connect-network-wifi').disabled = !data.remembered; detailsPage.hasSecurity = security != undefined; } else if (data.type == 'Wimax') { - assert(data.Wimax, 'Wimax network has no Wimax object' + networkName); + assert('Wimax' in data, + 'Wimax network has no Wimax object' + networkName); OptionsPage.showTab($('wimax-network-nav-tab')); detailsPage.gsm = false; detailsPage.shared = data.shared; detailsPage.showPreferred = data.remembered; $('wimax-connection-state').textContent = connectionStateString; $('auto-connect-network-wimax').checked = - getActiveValue(data, 'AutoConnect'); + getManagedValue(data, 'AutoConnect'); $('auto-connect-network-wimax').disabled = !data.remembered; var identity; if (data.Wimax.EAP) - identity = getActiveValue(data.Wimax.EAP, 'Identity'); + identity = getManagedValue(data.Wimax.EAP, 'Identity'); setOrHideParent('wimax-eap-identity', identity); $('wimax-signal-strength').textContent = strengthString; } else if (data.type == 'Cellular') { - assert(data.Cellular, + assert('Cellular' in data, 'Cellular network has no Cellular object' + networkName); OptionsPage.showTab($('cellular-conn-nav-tab')); if (data.showCarrierSelect && data.currentCarrierIndex != -1) { @@ -1227,27 +1275,29 @@ cr.define('options.internet', function() { } $('network-technology').textContent = - getActiveDictionaryValue(data, 'Cellular', 'NetworkTechnology'); + getManagedValue(data, 'Cellular.NetworkTechnology'); $('activation-state').textContent = data.activationState; $('roaming-state').textContent = data.roamingState; $('restricted-pool').textContent = data.restrictedPool; $('error-state').textContent = data.errorMessage; $('manufacturer').textContent = - getActiveDictionaryValue(data, 'Cellular', 'Manufacturer'); - $('model-id').textContent = - getActiveDictionaryValue(data, 'Cellular', 'ModelID'); + getManagedValue(data, 'Cellular.Manufacturer'); + $('model-id').textContent = getManagedValue(data, 'Cellular.ModelID'); $('firmware-revision').textContent = - getActiveDictionaryValue(data, 'Cellular', 'FirmwareRevision'); + getManagedValue(data, 'Cellular.FirmwareRevision'); $('hardware-revision').textContent = - getActiveDictionaryValue(data, 'Cellular', 'HardwareRevision'); - $('mdn').textContent = getActiveDictionaryValue(data, 'Cellular', 'MDN'); + getManagedValue(data, 'Cellular.HardwareRevision'); + $('mdn').textContent = getManagedValue(data, 'Cellular.MDN'); // Show ServingOperator properties only if available. - if (data.Cellular.ServingOperator) { - $('operator-name').textContent = - getActiveValue(data.Cellular.ServingOperator, 'Name'); - $('operator-code').textContent = - getActiveValue(data.Cellular.ServingOperator, 'Code'); + var servingOperatorName = + getManagedValue(data, 'Cellular.ServingOperator.Name'); + var servingOperatorCode = + getManagedValue(data, 'Cellular.ServingOperator.Code'); + if (servingOperatorName != undefined && + servingOperatorCode != undefined) { + $('operator-name').textContent = servingOperatorName; + $('operator-code').textContent = servingOperatorCode; } else { $('operator-name').parentElement.hidden = true; $('operator-code').parentElement.hidden = true; @@ -1258,23 +1308,18 @@ cr.define('options.internet', function() { updateHidden('#details-internet-page .cdma-only', false); // Show IMEI/ESN/MEID/MIN/PRL only if they are available. - setOrHideParent('esn', getActiveDictionaryValue(data, 'Cellular', 'ESN')); - setOrHideParent( - 'imei', getActiveDictionaryValue(data, 'Cellular', 'IMEI')); - setOrHideParent( - 'meid', getActiveDictionaryValue(data, 'Cellular', 'MEID')); - setOrHideParent('min', getActiveDictionaryValue(data, 'Cellular', 'MIN')); - setOrHideParent( - 'prl-version', - getActiveDictionaryValue(data, 'Cellular', 'PRLVersion')); - - var family = getActiveDictionaryValue(data, 'Cellular', 'GSM'); + setOrHideParent('esn', getManagedValue(data, 'Cellular.ESN')); + setOrHideParent('imei', getManagedValue(data, 'Cellular.IMEI')); + setOrHideParent('meid', getManagedValue(data, 'Cellular.MEID')); + setOrHideParent('min', getManagedValue(data, 'Cellular.MIN')); + setOrHideParent('prl-version', + getManagedValue(data, 'Cellular.PRLVersion')); + + var family = getManagedValue(data, 'Cellular.GSM'); detailsPage.gsm = family == 'GSM'; if (detailsPage.gsm) { - $('iccid').textContent = - getActiveDictionaryValue(data, 'Cellular', 'ICCID'); - $('imsi').textContent = - getActiveDictionaryValue(data, 'Cellular', 'IMSI'); + $('iccid').textContent = getManagedValue(data, 'Cellular.ICCID'); + $('imsi').textContent = getManagedValue(data, 'Cellular.IMSI'); var apnSelector = $('select-apn'); // Clear APN lists, keep only last element that "other". @@ -1324,7 +1369,7 @@ cr.define('options.internet', function() { $('change-pin').hidden = !lockEnabled; } $('auto-connect-network-cellular').checked = - getActiveValue(data, 'AutoConnect'); + getManagedValue(data, 'AutoConnect'); $('auto-connect-network-cellular').disabled = false; $('buyplan-details').hidden = !data.showBuyButton; @@ -1337,16 +1382,24 @@ cr.define('options.internet', function() { OptionsPage.showTab($('vpn-nav-tab')); detailsPage.gsm = false; $('inet-service-name').textContent = networkName; - $('inet-provider-type').textContent = data.providerType; - $('inet-username').textContent = data.username; + $('inet-provider-type').textContent = + getManagedValue(data, 'VPN.Type', GetManagedTypes.TRANSLATED); + var providerType = + getManagedValue(data, 'VPN.Type', GetManagedTypes.ACTIVE); + var providerKey = 'VPN.' + providerType; + $('inet-username').textContent = + getManagedValue(data, providerKey + '.Username'); var inetServerHostname = $('inet-server-hostname'); - inetServerHostname.value = data.serverHostname.value; + inetServerHostname.value = getManagedValue(data, 'VPN.Host'); inetServerHostname.resetHandler = function() { PageManager.hideBubble(); - inetServerHostname.value = data.serverHostname.recommendedValue; + var recommended = + getManagedValue(data, 'VPN.Host', GetManagedTypes.RECOMMENDED); + if (recommended != undefined) + inetServerHostname.value = recommended; }; $('auto-connect-network-vpn').checked = - getActiveValue(data, 'AutoConnect'); + getManagedValue(data, 'AutoConnect'); $('auto-connect-network-vpn').disabled = false; } else { OptionsPage.showTab($('internet-nav-tab')); @@ -1356,16 +1409,20 @@ cr.define('options.internet', function() { var indicators = cr.doc.querySelectorAll( '#details-internet-page .controlled-setting-indicator'); for (var i = 0; i < indicators.length; i++) { - var attributeName = - indicators[i].hasAttribute('managed') ? 'managed' : 'data'; + var managed = indicators[i].hasAttribute('managed'); + var attributeName = managed ? 'managed' : 'data'; var propName = indicators[i].getAttribute(attributeName); - if (!propName || !data[propName]) + if (!propName) + continue; + var propValue = + managed ? getManagedProperty(data, propName) : data[propName]; + if (propValue == undefined) continue; var event; - if (attributeName == 'managed') - event = detailsPage.createManagedEvent_(propName, data[propName]); + if (managed) + event = detailsPage.createManagedEvent_(propName, propValue); else - event = detailsPage.createControlledEvent_(propName, data[propName]); + event = detailsPage.createControlledEvent_(propName, propValue); indicators[i].handlePrefChange(event); var forElement = $(indicators[i].getAttribute('for')); if (forElement) { diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index c4c8e95..f49f63e 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -43,6 +43,7 @@ #include "chromeos/network/network_state_handler.h" #include "chromeos/network/network_util.h" #include "chromeos/network/onc/onc_signature.h" +#include "chromeos/network/onc/onc_translation_tables.h" #include "chromeos/network/onc/onc_translator.h" #include "chromeos/network/onc/onc_utils.h" #include "components/onc/onc_constants.h" @@ -62,6 +63,10 @@ namespace options { namespace { +// The key in a Managed Value dictionary for translated values. +// TODO(stevenjb): Consider making this part of the ONC spec. +const char kTranslatedKey[] = "Translated"; + // Keys for the network description dictionary passed to the web ui. Make sure // to keep the strings in sync with what the JavaScript side uses. const char kNetworkInfoKeyIconURL[] = "iconURL"; @@ -149,8 +154,6 @@ const char kTagNetworkId[] = "networkId"; const char kTagOptions[] = "options"; const char kTagPassword[] = "password"; const char kTagPolicy[] = "policy"; -const char kTagPreferred[] = "preferred"; -const char kTagProviderType[] = "providerType"; const char kTagProviderApnList[] = "providerApnList"; const char kTagRecommended[] = "recommended"; const char kTagRecommendedValue[] = "recommendedValue"; @@ -158,7 +161,6 @@ const char kTagRemembered[] = "remembered"; const char kTagRememberedList[] = "rememberedList"; const char kTagRestrictedPool[] = "restrictedPool"; const char kTagRoamingState[] = "roamingState"; -const char kTagServerHostname[] = "serverHostname"; const char kTagCarriers[] = "carriers"; const char kTagCurrentCarrierIndex[] = "currentCarrierIndex"; const char kTagShared[] = "shared"; @@ -334,20 +336,20 @@ const char* GetOncSettingString(::onc::ONCSource onc_source) { // Creates a GetManagedProperties style dictionary and adds it to |settings|. // |default_value| represents either the recommended value if |recommended| -// is true, or the enforced value if |recommended| is false. +// is true, or the enforced value if |recommended| is false. |settings_dict_key| +// is expected to be an ONC key with no '.' in it. // Note(stevenjb): This is bridge code until we use GetManagedProperties to // retrieve Shill properties. -void SetManagedValueDictionary(const char* key, - const base::Value* value, - ::onc::ONCSource onc_source, - bool recommended, - const base::Value* default_value, - base::DictionaryValue* settings) { +void SetManagedValueDictionaryEx(const char* settings_dict_key, + const base::Value& value, + ::onc::ONCSource onc_source, + bool recommended, + const base::Value* default_value, + base::DictionaryValue* settings_dict) { base::DictionaryValue* dict = new base::DictionaryValue(); - settings->Set(key, dict); + settings_dict->SetWithoutPathExpansion(settings_dict_key, dict); - DCHECK(value); - dict->Set(::onc::kAugmentationActiveSetting, value->DeepCopy()); + dict->Set(::onc::kAugmentationActiveSetting, value.DeepCopy()); if (onc_source == ::onc::ONC_SOURCE_NONE) return; @@ -360,9 +362,9 @@ void SetManagedValueDictionary(const char* key, if (default_value) { std::string policy_source = GetOncPolicyString(onc_source); dict->Set(policy_source, default_value->DeepCopy()); - if (recommended && !value->Equals(default_value)) { + if (recommended && !value.Equals(default_value)) { std::string setting_source = GetOncSettingString(onc_source); - dict->Set(setting_source, value->DeepCopy()); + dict->Set(setting_source, value.DeepCopy()); dict->SetString(::onc::kAugmentationEffectiveSetting, setting_source); } else { dict->SetString(::onc::kAugmentationEffectiveSetting, policy_source); @@ -370,6 +372,48 @@ void SetManagedValueDictionary(const char* key, } } +// Wrapper for SetManagedValueDictionaryEx that does the policy lookup. +// Note: We have to pass |onc_key| separately from |settings_dict_key| since +// we might be populating a sub-dictionary in which case |onc_key| will be the +// complete path (e.g. 'VPN.Host') and |settings_dict_key| is the dictionary key +// (e.g. 'Host'). +void SetManagedValueDictionary(const std::string& guid, + const char* settings_dict_key, + const base::Value& value, + const std::string& onc_key, + base::DictionaryValue* settings_dict) { + ::onc::ONCSource onc_source = ::onc::ONC_SOURCE_NONE; + const base::DictionaryValue* onc = + onc::FindPolicyForActiveUser(guid, &onc_source); + DCHECK_EQ(onc == NULL, onc_source == ::onc::ONC_SOURCE_NONE); + const base::Value* default_value = NULL; + bool recommended = false; + if (onc) { + onc->Get(onc_key, &default_value); + recommended = onc::IsRecommendedValue(onc, onc_key); + } + SetManagedValueDictionaryEx(settings_dict_key, + value, + onc_source, + recommended, + default_value, + settings_dict); +} + +// Creates a GetManagedProperties style dictionary with an Active value and +// a Translated value, and adds it to |settings|. +// Note(stevenjb): This is bridge code until we use GetManagedProperties to +// retrieve Shill properties and include Translated values. +void SetTranslatedDictionary(const char* settings_dict_key, + const std::string& value, + const std::string& translated_value, + base::DictionaryValue* settings_dict) { + base::DictionaryValue* dict = new base::DictionaryValue(); + settings_dict->Set(settings_dict_key, dict); + dict->SetString(::onc::kAugmentationActiveSetting, value); + dict->SetString(kTranslatedKey, translated_value); +} + std::string CopyStringFromDictionary(const base::DictionaryValue& source, const std::string& src_key, const std::string& dest_key, @@ -387,46 +431,55 @@ void PopulateVPNDetails(const NetworkState* vpn, base::DictionaryValue* dictionary) { // Name and Remembered are set in PopulateConnectionDetails(). // Provider properties are stored in the "Provider" dictionary. - const base::DictionaryValue* provider_properties = NULL; + const base::DictionaryValue* shill_provider_properties = NULL; if (!shill_properties.GetDictionaryWithoutPathExpansion( - shill::kProviderProperty, &provider_properties)) { + shill::kProviderProperty, &shill_provider_properties)) { LOG(ERROR) << "No provider properties for VPN: " << vpn->path(); return; } - std::string provider_type; - provider_properties->GetStringWithoutPathExpansion( - shill::kTypeProperty, &provider_type); - dictionary->SetString(kTagProviderType, - internet_options_strings::ProviderTypeString( - provider_type, - *provider_properties)); + base::DictionaryValue* vpn_dictionary = new base::DictionaryValue; + dictionary->Set(::onc::network_config::kVPN, vpn_dictionary); + std::string shill_provider_type; + if (!shill_provider_properties->GetStringWithoutPathExpansion( + shill::kTypeProperty, &shill_provider_type)) { + LOG(ERROR) << "Shill VPN has no Provider.Type: " << vpn->path(); + return; + } + std::string onc_provider_type; + onc::TranslateStringToONC( + onc::kVPNTypeTable, shill_provider_type, &onc_provider_type); + SetTranslatedDictionary( + ::onc::vpn::kType, + onc_provider_type, + internet_options_strings::ProviderTypeString(shill_provider_type, + *shill_provider_properties), + vpn_dictionary); + + std::string provider_type_key; std::string username; - if (provider_type == shill::kProviderOpenVpn) { - provider_properties->GetStringWithoutPathExpansion( + if (shill_provider_type == shill::kProviderOpenVpn) { + provider_type_key = ::onc::vpn::kOpenVPN; + shill_provider_properties->GetStringWithoutPathExpansion( shill::kOpenVPNUserProperty, &username); } else { - provider_properties->GetStringWithoutPathExpansion( + provider_type_key = ::onc::vpn::kL2TP; + shill_provider_properties->GetStringWithoutPathExpansion( shill::kL2tpIpsecUserProperty, &username); } - dictionary->SetString(kTagUsername, username); + base::DictionaryValue* provider_type_dictionary = new base::DictionaryValue; + vpn_dictionary->Set(provider_type_key, provider_type_dictionary); + provider_type_dictionary->SetString(::onc::vpn::kUsername, username); - ::onc::ONCSource onc_source = ::onc::ONC_SOURCE_NONE; - const base::DictionaryValue* onc = - onc::FindPolicyForActiveUser(vpn->guid(), &onc_source); - - NetworkPropertyUIData hostname_ui_data; - hostname_ui_data.ParseOncProperty( - onc_source, - onc, - ::onc::network_config::VpnProperty(::onc::vpn::kHost)); std::string provider_host; - provider_properties->GetStringWithoutPathExpansion( + shill_provider_properties->GetStringWithoutPathExpansion( shill::kHostProperty, &provider_host); - SetValueDictionary(kTagServerHostname, - new base::StringValue(provider_host), - hostname_ui_data, - dictionary); + SetManagedValueDictionary( + vpn->guid(), + ::onc::vpn::kHost, + base::StringValue(provider_host), + ::onc::network_config::VpnProperty(::onc::vpn::kHost), + vpn_dictionary); } // Given a list of supported carrier's by the device, return the index of @@ -1332,11 +1385,11 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback( int priority = 0; shill_properties.GetIntegerWithoutPathExpansion( shill::kPriorityProperty, &priority); - bool preferred = priority > 0; - SetValueDictionary(kTagPreferred, - new base::FundamentalValue(preferred), - property_ui_data, - dictionary.get()); + SetManagedValueDictionary(network->guid(), + ::onc::network_config::kPriority, + base::FundamentalValue(priority), + ::onc::network_config::kPriority, + dictionary.get()); std::string onc_path_to_auto_connect; if (network->Matches(NetworkTypePattern::WiFi())) { @@ -1371,8 +1424,7 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback( shill_properties.GetBooleanWithoutPathExpansion( shill::kAutoConnectProperty, &auto_connect); - scoped_ptr<base::Value> auto_connect_value( - new base::FundamentalValue(auto_connect)); + base::FundamentalValue auto_connect_value(auto_connect); ::onc::ONCSource auto_connect_onc_source = onc_source; DCHECK_EQ(onc == NULL, onc_source == ::onc::ONC_SOURCE_NONE); @@ -1397,15 +1449,15 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback( : ::onc::ONC_SOURCE_DEVICE_POLICY; if (auto_connect) { LOG(WARNING) << "Policy prevents autoconnect, but value is True."; - auto_connect_value.reset(new base::FundamentalValue(false)); + auto_connect_value = base::FundamentalValue(false); } } - SetManagedValueDictionary(shill::kAutoConnectProperty, - auto_connect_value.get(), - auto_connect_onc_source, - auto_connect_recommended, - auto_connect_default_value, - dictionary.get()); + SetManagedValueDictionaryEx(shill::kAutoConnectProperty, + auto_connect_value, + auto_connect_onc_source, + auto_connect_recommended, + auto_connect_default_value, + dictionary.get()); } // Show details dialog |