Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2602)

Unified Diff: chrome/browser/chromeos/arc/arc_settings_service.cc

Issue 2436753002: Removed ONC check in ArcSettingsService. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_settings_service_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_settings_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698