| Index: chrome/browser/extensions/extension_system_impl.cc | 
| diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc | 
| index 251b8a2089ba8b4192af08917806798c8745768e..040dfc31dd10e13e7de0c0a49808e0b84ac0209a 100644 | 
| --- a/chrome/browser/extensions/extension_system_impl.cc | 
| +++ b/chrome/browser/extensions/extension_system_impl.cc | 
| @@ -208,8 +208,10 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { | 
| bool autoupdate_enabled = !profile_->IsGuestSession() && | 
| !profile_->IsSystemProfile(); | 
| #if defined(OS_CHROMEOS) | 
| -  if (!extensions_enabled) | 
| +  if (!extensions_enabled || | 
| +      chromeos::ProfileHelper::IsLockScreenAppProfile(profile_)) { | 
| autoupdate_enabled = false; | 
| +  } | 
| #endif  // defined(OS_CHROMEOS) | 
| extension_service_.reset(new ExtensionService( | 
| profile_, base::CommandLine::ForCurrentProcess(), | 
| @@ -232,7 +234,10 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { | 
| if (mode >= ContentVerifierDelegate::BOOTSTRAP) | 
| content_verifier_->Start(); | 
| info_map()->SetContentVerifier(content_verifier_.get()); | 
| - | 
| +#if defined(OS_CHROMEOS) | 
| +    if (chromeos::ProfileHelper::IsLockScreenAppProfile(profile_)) | 
| +      info_map()->SetIsLockScreenContext(true); | 
| +#endif | 
| management_policy_.reset(new ManagementPolicy); | 
| RegisterManagementPolicyProviders(); | 
| } | 
| @@ -245,8 +250,10 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { | 
| #if defined(OS_CHROMEOS) | 
| // Skip loading session extensions if we are not in a user session or if the | 
| // profile is the sign-in profile, which doesn't correspond to a user session. | 
| -  skip_session_extensions = !chromeos::LoginState::Get()->IsUserLoggedIn() || | 
| -                            chromeos::ProfileHelper::IsSigninProfile(profile_); | 
| +  skip_session_extensions = | 
| +      !chromeos::LoginState::Get()->IsUserLoggedIn() || | 
| +      chromeos::ProfileHelper::IsSigninProfile(profile_) || | 
| +      chromeos::ProfileHelper::IsLockScreenAppProfile(profile_); | 
| if (chrome::IsRunningInForcedAppMode()) { | 
| extension_service_->component_loader()-> | 
| AddDefaultComponentExtensionsForKioskMode(skip_session_extensions); | 
|  |