Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1523)

Unified Diff: chrome/browser/ui/webui/help/help_utils_chromeos.cc

Issue 2913323003: Settings: Network: Merge Tether networks into Mobile subpage (Closed)
Patch Set: Rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/help/help_utils_chromeos.cc
diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
index 1420ac5e6160ac43486ec0ae09e5e64c036b2d7b..4565747c3a309b109d88e5708f89bb4416b5d3d7 100644
--- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc
+++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -60,8 +60,10 @@ base::string16 GetConnectionTypeAsUTF16(const std::string& type) {
return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_WIMAX);
if (type == shill::kTypeBluetooth)
return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_BLUETOOTH);
- if (type == shill::kTypeCellular)
- return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_CELLULAR);
+ if (type == shill::kTypeCellular ||
+ chromeos::NetworkTypePattern::Tether().MatchesType(type)) {
+ return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_MOBILE_DATA);
+ }
if (type == shill::kTypeVPN)
return l10n_util::GetStringUTF16(IDS_NETWORK_TYPE_VPN);
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698