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

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 12676017: Adding policy support to the new network configuration stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Julian's comments. Reuploaded with rebase. Created 7 years, 8 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
Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index e811e1034ebaecfe2c966778451bfc149fc748fb..23217c9392d6ebb7a5b035dc4a3411d7f8179dfa 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -73,6 +73,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/logging_chrome.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/session_manager_client.h"
#include "content/public/browser/browser_thread.h"
@@ -433,14 +434,10 @@ void LoginUtilsImpl::InitProfilePreferences(Profile* user_profile) {
if (use_shared_proxies_pref->IsDefaultValue())
user_profile->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
- // Locally managed users do not have user policy initialized.
- if (!UserManager::Get()->IsLoggedInAsLocallyManagedUser()) {
- policy::NetworkConfigurationUpdater* network_configuration_updater =
- g_browser_process->browser_policy_connector()->
- GetNetworkConfigurationUpdater();
- if (network_configuration_updater)
- network_configuration_updater->OnUserPolicyInitialized();
- }
+ // Notify the network configuration updater that policies are initialized. If
+ // there is no policy, it will read an empty policy which is fine.
+ g_browser_process->browser_policy_connector()->
+ GetNetworkConfigurationUpdater()->OnUserPolicyInitialized();
RespectLocalePreference(user_profile);
}

Powered by Google App Engine
This is Rietveld 408576698