Uninstall themes after the undo infobar goes away.

We don't hold a pointer to the Extension in ThemeInstalledInfobarDelegate because it can become invalid.  Instead we use the id to uninstall if the extension exists at infobar close time.

Also keep the code for deleting themes on shutdown to clean up old users and because a crash could leave themes hanging around.

BUG=25832

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

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

1 files changed, 12 insertions, 4 deletions

diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h
index 594764a..90c25a5 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.h
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h
@@ -7,6 +7,7 @@
 
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 
+class Extension;
 class SkBitmap;
 class TabContents;
 
@@ -15,8 +16,8 @@ class TabContents;
 class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   ThemeInstalledInfoBarDelegate(TabContents* tab_contents,
-                                const std::string& name,
-                                const std::string& previous_theme);
+                                const Extension* new_theme,
+                                const std::string& previous_theme_id);
   virtual void InfoBarClosed();
   virtual std::wstring GetMessageText() const;
   virtual SkBitmap* GetIcon() const;
@@ -29,10 +30,17 @@ class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate {
  protected:
   Profile* profile() { return profile_; }
 
+  // Keeps track of whether we canceled the install or not.
+  bool was_canceled_;
+
  private:
   Profile* profile_;
-  std::string name_;  // name of theme to install
-  std::string previous_theme_id_;  // used to undo theme install
+  // Name of theme that's just been installed.
+  std::string name_;
+  // Id of theme that's just been installed.
+  std::string new_theme_id_;
+  // Used to undo theme install.
+  std::string previous_theme_id_;
 };
 
 #endif  // CHROME_BROWSER_VIEWS_EXTENSIONS_THEME_INSTALLED_INFOBAR_DELEGATE_H_