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

Unified Diff: chrome/browser/signin/easy_unlock_service.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
Index: chrome/browser/signin/easy_unlock_service.cc
diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc
index 495b30cf61cecc5f7414245ac5612e4e92becec1..207e735b5423912a840c70253be7cfa8c139419d 100644
--- a/chrome/browser/signin/easy_unlock_service.cc
+++ b/chrome/browser/signin/easy_unlock_service.cc
@@ -524,8 +524,12 @@ void EasyUnlockService::LoadApp() {
if (!easy_unlock_path.empty()) {
extensions::ComponentLoader* loader = GetComponentLoader(profile_);
- if (!loader->Exists(extension_misc::kEasyUnlockAppId))
- loader->Add(IDR_EASY_UNLOCK_MANIFEST, easy_unlock_path);
+ if (!loader->Exists(extension_misc::kEasyUnlockAppId)) {
+ int manifest_id =
+ GetType() == TYPE_REGULAR ? IDR_EASY_UNLOCK_MANIFEST :
+ IDR_EASY_UNLOCK_MANIFEST_SIGNIN;
+ loader->Add(manifest_id, easy_unlock_path);
+ }
ExtensionService* extension_service =
extensions::ExtensionSystem::Get(profile_)->extension_service();
« no previous file with comments | « chrome/browser/resources/easy_unlock/manifest_signin.json ('k') | chrome/browser/signin/easy_unlock_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698