Chromium Code Reviews| 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 2ee8ce7b1a1b8390b67e5c374ea4e9fbc9f2123f..0990e7efac7ea78ec5a13dea3dc18af5944cccb5 100644 |
| --- a/chrome/browser/ui/webui/settings/about_handler.cc |
| +++ b/chrome/browser/ui/webui/settings/about_handler.cc |
| @@ -69,6 +69,8 @@ |
| #include "chrome/browser/ui/webui/help/version_updater_chromeos.h" |
| #include "chromeos/chromeos_switches.h" |
| #include "chromeos/dbus/power_manager_client.h" |
| +#include "chromeos/network/network_state.h" |
| +#include "chromeos/network/network_state_handler.h" |
| #include "chromeos/system/statistics_provider.h" |
| #include "components/user_manager/user_manager.h" |
| #endif |
| @@ -98,8 +100,18 @@ struct RegulatoryLabel { |
| // Returns message that informs user that for update it's better to |
| // connect to a network of one of the allowed types. |
| base::string16 GetAllowedConnectionTypesMessage() { |
| - if (help_utils_chromeos::IsUpdateOverCellularAllowed()) { |
| - return l10n_util::GetStringUTF16(IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED); |
| + const chromeos::NetworkState* network = chromeos::NetworkHandler::Get() |
| + ->network_state_handler() |
| + ->DefaultNetwork(); |
| + bool cellular = network && network->IsConnectedState() && |
|
xiyuan
2017/05/22 18:14:08
nit: const bool
weidongg
2017/05/22 19:02:54
Done.
|
| + network->type() == shill::kTypeCellular; |
| + |
| + if (help_utils_chromeos::IsUpdateOverCellularAllowed( |
| + true /* interactive */)) { |
| + return cellular ? l10n_util::GetStringUTF16( |
| + IDS_UPGRADE_NETWORK_LIST_CELLULAR_NOT_RECOMMENDED) |
| + : l10n_util::GetStringUTF16( |
| + IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED); |
| } else { |
| return l10n_util::GetStringUTF16( |
| IDS_UPGRADE_NETWORK_LIST_CELLULAR_DISALLOWED); |