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

Unified Diff: chrome/browser/ui/webui/settings/about_handler.cc

Issue 2919683002: Treat tethered networks as mobile networks (Closed)
Patch Set: Clean up code 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
« no previous file with comments | « chrome/browser/ui/webui/help/version_updater_chromeos.cc ('k') | chromeos/network/network_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/about_handler.cc
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index bad234e3187288a8aa033d9c9d2d8b46c7071817..05db7d110ad4724be4d4b66ca7ceb19fa7fab85d 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -103,12 +103,12 @@ base::string16 GetAllowedConnectionTypesMessage() {
const chromeos::NetworkState* network = chromeos::NetworkHandler::Get()
->network_state_handler()
->DefaultNetwork();
- const bool cellular = network && network->IsConnectedState() &&
- network->type() == shill::kTypeCellular;
+ const bool mobile_data =
+ network && network->IsConnectedState() && network->IsUsingMobileData();
if (help_utils_chromeos::IsUpdateOverCellularAllowed(
true /* interactive */)) {
- return cellular
+ return mobile_data
? l10n_util::GetStringUTF16(
IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED_NOT_AUTOMATIC)
: l10n_util::GetStringUTF16(
« no previous file with comments | « chrome/browser/ui/webui/help/version_updater_chromeos.cc ('k') | chromeos/network/network_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698