Change Sideload Wipeout to only wipe out extensions installed through Registry and polish the UI a bit:
Sideload Wipeout Bubble:
- Show the bubble a few seconds after startup.
- Draw the Learn More link at the end of the text blurb describing what you can do about extensions being disabled.
- Set the bubble to close on Escape being pressed.
- Work around bug 165808 (bubble positioning incorrect for bubbles anchored off the hot dogs menu).
- Minor improvements to the contents of the bubble (remove italics and add a bullet point in front of extension names).
- Don't set Extension Settings as default button (moch has no button as default, and it works better that way since Enter can then be used on non-default button).
Sideload Wipeout Banner (on chrome://extensions):
- Remove underline from Learn More link.
- Remove exclamation point icon from banner.
BUG=154624
TEST=Bubble should work as before, except appear with a slightly delay, and look more like the mocks and not overlap the window border. Esc should work and only registry extensions should be wiped.
Review URL: https://chromiumcodereview.appspot.com/11572016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173013 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 121e38d..0a3c1bd 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -2332,10 +2332,7 @@
return;
Extension::Location location = extension->location();
- bool wipable = location == Extension::EXTERNAL_REGISTRY ||
- (location == Extension::INTERNAL &&
- !extension->UpdatesFromGallery());
- if (!wipable)
+ if (location != Extension::EXTERNAL_REGISTRY)
return;
if (extension_prefs_->IsExternalExtensionExcludedFromWipeout(extension->id()))
