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

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

Issue 10834191: new implementation of default apps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 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 d6b0d9656d1d7385d2b846bdede06a2bd146e0bb..f72a53f108cf19cd59315551d11825d5b141a9eb 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -2252,8 +2252,13 @@ bool ExtensionService::OnExternalExtensionFileFound(
bool mark_acknowledged) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
CHECK(Extension::IdIsValid(id));
- if (extension_prefs_->IsExternalExtensionUninstalled(id))
- return false;
+
+ // The default apps use the external extensions installer but are installed
+ // as internal.
+ if (location != Extension::INTERNAL) {
+ if (extension_prefs_->IsExternalExtensionUninstalled(id))
+ return false;
+ }
DCHECK(version);

Powered by Google App Engine
This is Rietveld 408576698