| Index: chrome/browser/chromeos/arc/arc_settings_service.cc
|
| diff --git a/chrome/browser/chromeos/arc/arc_settings_service.cc b/chrome/browser/chromeos/arc/arc_settings_service.cc
|
| index 4b269c5b83aadad7f55e7963b5dc354f638f0742..97841f3a36c8662f99ed5842e9e627d780509df2 100644
|
| --- a/chrome/browser/chromeos/arc/arc_settings_service.cc
|
| +++ b/chrome/browser/chromeos/arc/arc_settings_service.cc
|
| @@ -474,14 +474,11 @@ void ArcSettingsServiceImpl::SendSettingsBroadcast(
|
|
|
| void ArcSettingsServiceImpl::DefaultNetworkChanged(
|
| const chromeos::NetworkState* network) {
|
| - // kProxy pref and ONC policy have more priority than the default network
|
| - // update.
|
| - Profile* profile = ProfileManager::GetActiveUserProfile();
|
| - if (network && !IsPrefProxyConfigApplied() &&
|
| - !chromeos::onc::HasPolicyForNetwork(
|
| - profile->GetPrefs(), g_browser_process->local_state(), *network)) {
|
| + // kProxy pref has more priority than the default network update.
|
| + // If a default network is changed to the network with ONC policy with proxy
|
| + // settings, it should be translated here.
|
| + if (network && !IsPrefProxyConfigApplied())
|
| SyncProxySettings();
|
| - }
|
| }
|
|
|
| ArcSettingsService::ArcSettingsService(ArcBridgeService* bridge_service)
|
|
|