| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" |
| 6 | 6 |
| 7 #include <ctype.h> | 7 #include <ctype.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 const char kTagCellularAvailable[] = "cellularAvailable"; | 116 const char kTagCellularAvailable[] = "cellularAvailable"; |
| 117 const char kTagCellularEnabled[] = "cellularEnabled"; | 117 const char kTagCellularEnabled[] = "cellularEnabled"; |
| 118 const char kTagCellularSupportsScan[] = "cellularSupportsScan"; | 118 const char kTagCellularSupportsScan[] = "cellularSupportsScan"; |
| 119 const char kTagConfigure[] = "configure"; | 119 const char kTagConfigure[] = "configure"; |
| 120 const char kTagConnect[] = "connect"; | 120 const char kTagConnect[] = "connect"; |
| 121 const char kTagDeviceConnected[] = "deviceConnected"; | 121 const char kTagDeviceConnected[] = "deviceConnected"; |
| 122 const char kTagDisconnect[] = "disconnect"; | 122 const char kTagDisconnect[] = "disconnect"; |
| 123 const char kTagErrorMessage[] = "errorMessage"; | 123 const char kTagErrorMessage[] = "errorMessage"; |
| 124 const char kTagForget[] = "forget"; | 124 const char kTagForget[] = "forget"; |
| 125 const char kTagOptions[] = "options"; | 125 const char kTagOptions[] = "options"; |
| 126 const char kTagRemembered[] = "remembered"; | |
| 127 const char kTagRememberedList[] = "rememberedList"; | 126 const char kTagRememberedList[] = "rememberedList"; |
| 128 const char kTagCarriers[] = "carriers"; | 127 const char kTagCarriers[] = "carriers"; |
| 129 const char kTagCurrentCarrierIndex[] = "currentCarrierIndex"; | 128 const char kTagCurrentCarrierIndex[] = "currentCarrierIndex"; |
| 130 const char kTagShared[] = "shared"; | |
| 131 const char kTagShowActivateButton[] = "showActivateButton"; | 129 const char kTagShowActivateButton[] = "showActivateButton"; |
| 132 const char kTagShowViewAccountButton[] = "showViewAccountButton"; | 130 const char kTagShowViewAccountButton[] = "showViewAccountButton"; |
| 133 const char kTagTrue[] = "true"; | 131 const char kTagTrue[] = "true"; |
| 134 const char kTagVpnList[] = "vpnList"; | 132 const char kTagVpnList[] = "vpnList"; |
| 135 const char kTagWifiAvailable[] = "wifiAvailable"; | 133 const char kTagWifiAvailable[] = "wifiAvailable"; |
| 136 const char kTagWifiEnabled[] = "wifiEnabled"; | 134 const char kTagWifiEnabled[] = "wifiEnabled"; |
| 137 const char kTagWimaxAvailable[] = "wimaxAvailable"; | 135 const char kTagWimaxAvailable[] = "wimaxAvailable"; |
| 138 const char kTagWimaxEnabled[] = "wimaxEnabled"; | 136 const char kTagWimaxEnabled[] = "wimaxEnabled"; |
| 139 const char kTagWiredList[] = "wiredList"; | 137 const char kTagWiredList[] = "wiredList"; |
| 140 const char kTagWirelessList[] = "wirelessList"; | 138 const char kTagWirelessList[] = "wirelessList"; |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 scoped_ptr<base::DictionaryValue> PopulateConnectionDetails( | 304 scoped_ptr<base::DictionaryValue> PopulateConnectionDetails( |
| 307 const NetworkState* network, | 305 const NetworkState* network, |
| 308 const base::DictionaryValue& onc_properties) { | 306 const base::DictionaryValue& onc_properties) { |
| 309 scoped_ptr<base::DictionaryValue> dictionary(onc_properties.DeepCopy()); | 307 scoped_ptr<base::DictionaryValue> dictionary(onc_properties.DeepCopy()); |
| 310 | 308 |
| 311 dictionary->SetString(kNetworkInfoKeyServicePath, network->path()); | 309 dictionary->SetString(kNetworkInfoKeyServicePath, network->path()); |
| 312 dictionary->SetString( | 310 dictionary->SetString( |
| 313 kTagErrorMessage, | 311 kTagErrorMessage, |
| 314 ash::network_connect::ErrorString(network->error(), network->path())); | 312 ash::network_connect::ErrorString(network->error(), network->path())); |
| 315 | 313 |
| 316 dictionary->SetBoolean(kTagRemembered, !network->profile_path().empty()); | |
| 317 bool shared = !network->IsPrivate(); | |
| 318 dictionary->SetBoolean(kTagShared, shared); | |
| 319 | |
| 320 const std::string& type = network->type(); | 314 const std::string& type = network->type(); |
| 321 | 315 |
| 322 const NetworkState* connected_network = | 316 const NetworkState* connected_network = |
| 323 NetworkHandler::Get()->network_state_handler()->ConnectedNetworkByType( | 317 NetworkHandler::Get()->network_state_handler()->ConnectedNetworkByType( |
| 324 NetworkTypePattern::Primitive(type)); | 318 NetworkTypePattern::Primitive(type)); |
| 325 dictionary->SetBoolean(kTagDeviceConnected, connected_network != NULL); | 319 dictionary->SetBoolean(kTagDeviceConnected, connected_network != NULL); |
| 326 | 320 |
| 327 if (type == shill::kTypeCellular) | 321 if (type == shill::kTypeCellular) |
| 328 PopulateCellularDetails(network, dictionary.get()); | 322 PopulateCellularDetails(network, dictionary.get()); |
| 329 | 323 |
| (...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1142 dictionary->SetBoolean( | 1136 dictionary->SetBoolean( |
| 1143 kTagWimaxAvailable, | 1137 kTagWimaxAvailable, |
| 1144 handler->IsTechnologyAvailable(NetworkTypePattern::Wimax())); | 1138 handler->IsTechnologyAvailable(NetworkTypePattern::Wimax())); |
| 1145 dictionary->SetBoolean( | 1139 dictionary->SetBoolean( |
| 1146 kTagWimaxEnabled, | 1140 kTagWimaxEnabled, |
| 1147 handler->IsTechnologyEnabled(NetworkTypePattern::Wimax())); | 1141 handler->IsTechnologyEnabled(NetworkTypePattern::Wimax())); |
| 1148 } | 1142 } |
| 1149 | 1143 |
| 1150 } // namespace options | 1144 } // namespace options |
| 1151 } // namespace chromeos | 1145 } // namespace chromeos |
| OLD | NEW |