Merged Tether and cellular network types in System Tray.

chrome/browser/chromeos/tether/tether_service.cc

Index: chrome/browser/chromeos/tether/tether_service.cc
diff --git a/chrome/browser/chromeos/tether/tether_service.cc b/chrome/browser/chromeos/tether/tether_service.cc
index 797e978e9493975084f819dd189998e74be0db0e..9b8065b226fdd114bdc5ba0111df729d998c4f23 100644
--- a/chrome/browser/chromeos/tether/tether_service.cc
+++ b/chrome/browser/chromeos/tether/tether_service.cc
@@ -177,8 +177,8 @@ void TetherService::DeviceListChanged() {
   if (is_enabled != was_pref_enabled) {
     profile_->GetPrefs()->SetBoolean(prefs::kInstantTetheringEnabled,
                                      is_enabled);
-    UpdateTetherTechnologyState();
   }
+  UpdateTetherTechnologyState();
 }
 
 void TetherService::OnPrefsChanged() {
@@ -214,11 +214,12 @@ TetherService::GetTetherTechnologyState() {
   } else if (!IsAllowedByPolicy()) {
     return chromeos::NetworkStateHandler::TechnologyState::
         TECHNOLOGY_PROHIBITED;
-  } else if (!IsBluetoothAvailable()) {
+  } else if (!IsBluetoothAvailable() || IsCellularAvailableButNotEnabled()) {
     // TODO (hansberry): This unfortunately results in a weird UI state for
-    // Settings where the toggle is clickable but immediately becomes disabled
-    // after enabling it. Possible solution: grey out the toggle and tell the
-    // user to turn Bluetooth on?
+    // Settings where, when Bluetooth is unavailable, the toggle is clickable
+    // but immediately becomes disabled after enabling it.
+    // Possible solution: grey out the toggle and tell the user to turn
+    // Bluetooth on?
     return chromeos::NetworkStateHandler::TechnologyState::
         TECHNOLOGY_UNINITIALIZED;
   } else if (!IsEnabledbyPreference()) {
@@ -239,6 +240,13 @@ bool TetherService::IsBluetoothAvailable() const {
   return adapter_.get() && adapter_->IsPresent() && adapter_->IsPowered();
 }
 
+bool TetherService::IsCellularAvailableButNotEnabled() const {
+  return (network_state_handler_->IsTechnologyAvailable(
+              chromeos::NetworkTypePattern::Cellular()) &&
+          !network_state_handler_->IsTechnologyEnabled(
+              chromeos::NetworkTypePattern::Cellular()));
+}
+
 bool TetherService::IsAllowedByPolicy() const {
   return profile_->GetPrefs()->GetBoolean(prefs::kInstantTetheringAllowed);
 }