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

Unified Diff: chrome/browser/signin/easy_unlock_service_factory.cc

Issue 834233005: Make Easy Unlock app have separate instance in incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 11 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 | « chrome/browser/signin/easy_unlock_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698