Merge 23055 - Make the theme install infobar have an 'undo' button instead...

chrome/browser/extensions/extension_install_ui.h

Index: chrome/browser/extensions/extension_install_ui.h
===================================================================
--- chrome/browser/extensions/extension_install_ui.h	(revision 23160)
+++ chrome/browser/extensions/extension_install_ui.h	(working copy)
@@ -34,10 +34,11 @@
   virtual void OnInstallFailure(const std::string& error);
   virtual void OnOverinstallAttempted(Extension* extension);
 
-  void ShowThemeInfoBar(Extension* extension);
+  void ShowThemeInfoBar(Extension* new_theme);
 
   Profile* profile_;
   MessageLoop* ui_loop_;
+  std::string previous_theme_id_;  // Used to undo theme installation.
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_UI_H_
Property changes on: chrome\browser\extensions\extension_install_ui.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/extensions/extension_install_ui.h:r23055