Chromium Code Reviews| Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc |
| 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 f0eb6ecff9e5770039857846f64aa80eaca1c794..90b8809947a185775c8acb00b0c906208cd1b541 100644 |
| --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc |
| +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc |
| @@ -1542,7 +1542,10 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback( |
| dictionary.SetBoolean(kTagShowStaticIPConfig, staticIPConfig); |
| dictionary.SetBoolean(kTagShowPreferred, !network->profile_path().empty()); |
| - bool preferred = network->priority() > 0; |
| + int priority = 0; |
| + shill_properties.GetIntegerWithoutPathExpansion( |
| + flimflam::kPriorityProperty, &priority); |
| + bool preferred = priority > 0; |
| SetValueDictionary(&dictionary, kTagPreferred, |
| new base::FundamentalValue(preferred), |
| property_ui_data); |
| @@ -1564,8 +1567,11 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback( |
| auto_connect_ui_data.ParseOncProperty( |
| onc_source, onc, onc_path_to_auto_connect); |
| } |
| + bool auto_connect = false; |
| + shill_properties.GetBooleanWithoutPathExpansion( |
| + flimflam::kPriorityProperty, &auto_connect); |
|
pneubeck (no reviews)
2013/09/04 16:32:55
priority -> AutoConnect
stevenjb
2013/09/04 18:47:52
DOH. Thanks. Done.
|
| SetValueDictionary(&dictionary, kTagAutoConnect, |
| - new base::FundamentalValue(network->auto_connect()), |
| + new base::FundamentalValue(auto_connect), |
| auto_connect_ui_data); |
| PopulateConnectionDetails(network, shill_properties, &dictionary); |