Show the extension install UI when the user clicks Reenable for a disabled-on-upgrade extension.

Also fix a couple misc bugs with disabled extensions:
- Fix a crash when trying to reenable an uninstalled disabled extension.
- Fix a bug where upgrading a disabled extension would reenable it.

BUG=12140
TEST=no

Review URL: http://codereview.chromium.org/172006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23675 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index ebb8d13..08b77bb 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -1003,3 +1003,11 @@ void Extension::SetBackgroundPageReady() {
       Source<Extension>(this),
       NotificationService::NoDetails());
 }
+
+FilePath Extension::GetIconPath(Icons icon) {
+  std::map<int, std::string>::const_iterator iter =
+      icons_.find(Extension::EXTENSION_ICON_LARGE);
+  if (iter == icons_.end())
+    return FilePath();
+  return GetResourcePath(iter->second);
+}