diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 22:44:08 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 22:44:08 +0000 |
| commit | e6090e40b5914d7f09edb8349b01b5c819038c9c (patch) | |
| tree | 872d6b4f464650634ad997821d060e349c2caefb /chrome/browser/browser.cc | |
| parent | 98d42648fa48f58b280efcaf3068bca765fa1b34 (diff) | |
| download | chromium_src-e6090e40b5914d7f09edb8349b01b5c819038c9c.zip chromium_src-e6090e40b5914d7f09edb8349b01b5c819038c9c.tar.gz chromium_src-e6090e40b5914d7f09edb8349b01b5c819038c9c.tar.bz2 | |
Fix 2 bugs related to remembering loaded unpacked extensions.
- Extension disabled infobar was being shown at startup.
- Crashed extensions were persisted as unpacked extensions, regardless of how
they were installed.
BUG=30116
BUG=38856
Review URL: http://codereview.chromium.org/1157005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 990c6a2..4e37d4c 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -2577,13 +2577,15 @@ void Browser::Observe(NotificationType type, break; case NotificationType::EXTENSION_UPDATE_DISABLED: { - // Show the UI. + // Show the UI if the extension was disabled for escalated permissions. Profile* profile = Source<Profile>(source).ptr(); DCHECK_EQ(profile_, profile); ExtensionsService* service = profile->GetExtensionsService(); DCHECK(service); Extension* extension = Details<Extension>(details).ptr(); - ShowExtensionDisabledUI(service, profile_, extension); + if (service->extension_prefs()->DidExtensionEscalatePermissions( + extension->id())) + ShowExtensionDisabledUI(service, profile_, extension); break; } |