| Index: chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc
|
| diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc
|
| index 6ea318b4eb64f3a1b397830b107b35b7513788b4..50e3fb5e45fff93b8263506f6e86b9f7feabf981 100644
|
| --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc
|
| +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc
|
| @@ -61,8 +61,10 @@ bool UserNetworkConfigurationUpdaterFactory::ServiceIsNULLWhileTesting() const {
|
| KeyedService* UserNetworkConfigurationUpdaterFactory::BuildServiceInstanceFor(
|
| content::BrowserContext* context) const {
|
| Profile* profile = Profile::FromBrowserContext(context);
|
| - if (chromeos::ProfileHelper::IsSigninProfile(profile))
|
| - return NULL; // On the login screen only device network policies apply.
|
| + if (chromeos::ProfileHelper::IsSigninProfile(profile) ||
|
| + chromeos::ProfileHelper::IsLockScreenAppProfile(profile)) {
|
| + return nullptr; // On the login screen only device network policies apply.
|
| + }
|
|
|
| const user_manager::User* user =
|
| chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
|
| @@ -70,7 +72,7 @@ KeyedService* UserNetworkConfigurationUpdaterFactory::BuildServiceInstanceFor(
|
| // Currently, only the network policy of the primary user is supported. See
|
| // also http://crbug.com/310685 .
|
| if (user != user_manager::UserManager::Get()->GetPrimaryUser())
|
| - return NULL;
|
| + return nullptr;
|
|
|
| ProfilePolicyConnector* profile_connector =
|
| ProfilePolicyConnectorFactory::GetForBrowserContext(context);
|
|
|