Merged Tether and cellular network types in System Tray.

chrome/browser/chromeos/tether/tether_service.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/tether/tether_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 165 matching lines @@
                                       chromeos::NetworkStateHandler::
                                           TechnologyState::TECHNOLOGY_ENABLED) {
     is_enabled = true;
   } else {
     is_enabled = was_pref_enabled;
   }
 
   if (is_enabled != was_pref_enabled) {
     profile_->GetPrefs()->SetBoolean(prefs::kInstantTetheringEnabled,
                                      is_enabled);
-    UpdateTetherTechnologyState();
   }
+  UpdateTetherTechnologyState();
 }
 
 void TetherService::OnPrefsChanged() {
   UpdateTetherTechnologyState();
 }
 
 bool TetherService::HasSyncedTetherHosts() const {
   return !cryptauth_service_->GetCryptAuthDeviceManager()
               ->GetTetherHosts()
               .empty();
@@ skipping 15 matching lines @@
 
 chromeos::NetworkStateHandler::TechnologyState
 TetherService::GetTetherTechnologyState() {
   if (shut_down_ || suspended_ || session_manager_client_->IsScreenLocked() ||
       !HasSyncedTetherHosts()) {
     return chromeos::NetworkStateHandler::TechnologyState::
         TECHNOLOGY_UNAVAILABLE;
   } else if (!IsAllowedByPolicy()) {
     return chromeos::NetworkStateHandler::TechnologyState::
         TECHNOLOGY_PROHIBITED;
-  } else if (!IsBluetoothAvailable()) {
-    // 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?
+  } else if (!IsBluetoothAvailable() || IsCellularAvailableButNotEnabled()) {
+    // If Cellular technology is available, then Tether technology is treated
+    // as a subset of Cellular, and it should only be enabled when Cellular
+    // technology is enabled.
+    // TODO (hansberry): When !IsBluetoothAvailable(), this 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?
     return chromeos::NetworkStateHandler::TechnologyState::
         TECHNOLOGY_UNINITIALIZED;
   } else if (!IsEnabledbyPreference()) {
     return chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_AVAILABLE;
   }
 
   return chromeos::NetworkStateHandler::TechnologyState::TECHNOLOGY_ENABLED;
 }
 
 void TetherService::OnBluetoothAdapterFetched(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   if (shut_down_)
     return;
   adapter_ = adapter;
   adapter_->AddObserver(this);
   UpdateTetherTechnologyState();
 }
 
 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);
 }
 
 bool TetherService::IsEnabledbyPreference() const {
   return profile_->GetPrefs()->GetBoolean(prefs::kInstantTetheringEnabled);
 }