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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 1301323005: Implement kiosk multiple apps feature. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits. Created 5 years, 4 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/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 96e5fbff576f359e088cb9e4f2ed6823668c5b42..d89574777ed7917c328198769996f142fb535699 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -202,7 +202,12 @@ bool ExtensionService::OnExternalExtensionUpdateUrlFound(
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
CHECK(crx_file::id_util::IdIsValid(id));
- if (Manifest::IsExternalLocation(location)) {
+ // External extensions can be cached because they're the
+ // same across users, but it's necessary to exclude kiosk apps because
+ // the kiosk apps should be constrained in the isolated kiosk session
+ // and should not be shared across.
not at google - send to devlin 2015/08/31 18:11:52 This comment isn't a complete sentence.
jennyz 2015/08/31 23:57:25 Done.
+ if (Manifest::IsExternalLocation(location) &&
+ !extensions::ExtensionsBrowserClient::Get()->IsRunningInForcedAppMode()) {
not at google - send to devlin 2015/08/31 18:11:52 Without this change, does the test you added fail?
jennyz 2015/08/31 23:57:25 Yes, the test will fail since the cache write to a
jennyz 2015/09/01 16:53:09 Actually the tests passed now, since I have moved
// All extensions that are not user specific can be cached.
extensions::ExtensionsBrowserClient::Get()->GetExtensionCache()
->AllowCaching(id);

Powered by Google App Engine
This is Rietveld 408576698