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 750244d4266045daba1c49a06cd19e35eb85a0d0..1420ac5e6160ac43486ec0ae09e5e64c036b2d7b 100644 |
--- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc |
+++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc |
@@ -20,11 +20,11 @@ |
namespace help_utils_chromeos { |
-bool IsUpdateOverCellularAllowed() { |
- // If this is a Cellular First device, the default is to allow updates |
- // over cellular. |
+bool IsUpdateOverCellularAllowed(bool interactive) { |
+ // If this is a Cellular First device or the user actively checks for update, |
+ // the default is to allow updates over cellular. |
bool default_update_over_cellular_allowed = |
- chromeos::switches::IsCellularFirstDevice(); |
+ interactive ? true : chromeos::switches::IsCellularFirstDevice(); |
// Device Policy overrides the defaults. |
chromeos::CrosSettings* settings = chromeos::CrosSettings::Get(); |
@@ -46,7 +46,9 @@ bool IsUpdateOverCellularAllowed() { |
if (connection_type == 4) |
return true; |
} |
- return default_update_over_cellular_allowed; |
+ // Device policy does not allow updates over cellular, as cellular is not |
+ // included in allowed connection types for updates. |
+ return false; |
} |
base::string16 GetConnectionTypeAsUTF16(const std::string& type) { |