Index: chrome/browser/signin/easy_unlock_service_factory.cc |
diff --git a/chrome/browser/signin/easy_unlock_service_factory.cc b/chrome/browser/signin/easy_unlock_service_factory.cc |
index 38bc72ce49374243f4301489a7a0ae963656110a..c22bbab505affd07fa903309dc52cc25d650e2f0 100644 |
--- a/chrome/browser/signin/easy_unlock_service_factory.cc |
+++ b/chrome/browser/signin/easy_unlock_service_factory.cc |
@@ -50,7 +50,7 @@ KeyedService* EasyUnlockServiceFactory::BuildServiceInstanceFor( |
#if defined(OS_CHROMEOS) |
if (chromeos::ProfileHelper::IsSigninProfile( |
Profile::FromBrowserContext(context))) { |
- if (EasyUnlockService::IsSignInEnabled()) { |
+ if (EasyUnlockService::IsSignInEnabled() && context->IsOffTheRecord()) { |
return new EasyUnlockServiceSignin(Profile::FromBrowserContext(context)); |
} else { |
return NULL; |
@@ -62,6 +62,12 @@ KeyedService* EasyUnlockServiceFactory::BuildServiceInstanceFor( |
content::BrowserContext* EasyUnlockServiceFactory::GetBrowserContextToUse( |
content::BrowserContext* context) const { |
+#if defined(OS_CHROMEOS) |
+ if (chromeos::ProfileHelper::IsSigninProfile( |
+ Profile::FromBrowserContext(context))) { |
+ return chrome::GetBrowserContextOwnInstanceInIncognito(context); |
+ } |
+#endif |
return chrome::GetBrowserContextRedirectedInIncognito(context); |
} |