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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11232060: Make sure sideload wipeout doesn't interfere with the tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
===================================================================
--- chrome/browser/extensions/extension_service.cc (revision 163351)
+++ chrome/browser/extensions/extension_service.cc (working copy)
@@ -2191,8 +2191,10 @@
if (done)
return;
+ Extension::Type type = extension->GetType();
int disable_reasons = extension_prefs_->GetDisableReasons(extension->id());
- if (disable_reasons == Extension::DISABLE_NONE) {
+ if (disable_reasons == Extension::DISABLE_NONE &&
+ type == Extension::TYPE_EXTENSION) {
Extension::Location location = extension->location();
if (location == Extension::EXTERNAL_REGISTRY ||
(location == Extension::INTERNAL && !extension->from_webstore())) {
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698