OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/help/help_utils_chromeos.h" | 5 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 29 matching lines...) Expand all Loading... | |
40 LOG(WARNING) << "Can't parse connection type #" << i; | 40 LOG(WARNING) << "Can't parse connection type #" << i; |
41 continue; | 41 continue; |
42 } | 42 } |
43 if (connection_type == 4) | 43 if (connection_type == 4) |
44 return true; | 44 return true; |
45 } | 45 } |
46 return kDefaultUpdateOverCellularAllowed; | 46 return kDefaultUpdateOverCellularAllowed; |
47 } | 47 } |
48 | 48 |
49 string16 GetConnectionTypeAsUTF16(const std::string& type) { | 49 string16 GetConnectionTypeAsUTF16(const std::string& type) { |
50 if (type == flimflam::kTypeEthernet) | 50 if (type == flimflam::kTypeEthernet || type == shill::kTypeEthernetEap) |
stevenjb
2013/08/28 15:51:30
This is where having a method like shill_property_
pneubeck (no reviews)
2013/09/02 20:41:21
Done.
| |
51 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_ETHERNET); | 51 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_ETHERNET); |
52 if (type == flimflam::kTypeWifi) | 52 if (type == flimflam::kTypeWifi) |
53 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIFI); | 53 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIFI); |
54 if (type == flimflam::kTypeWimax) | 54 if (type == flimflam::kTypeWimax) |
55 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIMAX); | 55 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIMAX); |
56 if (type == flimflam::kTypeBluetooth) | 56 if (type == flimflam::kTypeBluetooth) |
57 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_BLUETOOTH); | 57 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_BLUETOOTH); |
58 if (type == flimflam::kTypeCellular) | 58 if (type == flimflam::kTypeCellular) |
59 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_CELLULAR); | 59 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_CELLULAR); |
60 if (type == flimflam::kTypeVPN) | 60 if (type == flimflam::kTypeVPN) |
61 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN); | 61 return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN); |
62 NOTREACHED(); | 62 NOTREACHED(); |
63 return string16(); | 63 return string16(); |
64 } | 64 } |
65 | 65 |
66 } // namespace help_utils_chromeos | 66 } // namespace help_utils_chromeos |
OLD | NEW |