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

chrome/browser/extensions/extension_install_ui.cc

Index: chrome/browser/extensions/extension_install_ui.cc
===================================================================
--- chrome/browser/extensions/extension_install_ui.cc	(revision 23160)
+++ chrome/browser/extensions/extension_install_ui.cc	(working copy)
@@ -37,6 +37,11 @@
   // immediately installed, and then we show an infobar (see OnInstallSuccess)
   // to allow the user to revert if they don't like it.
   if (extension->IsTheme()) {
+    // Remember the current theme in case the user pressed undo.
+    Extension* previous_theme = profile_->GetTheme();
+    if (previous_theme)
+      previous_theme_id_ = previous_theme->id();
+
     installer->ContinueInstall();
     return;
   }
@@ -98,8 +103,8 @@
   ShowThemeInfoBar(extension);
 }
 
-void ExtensionInstallUI::ShowThemeInfoBar(Extension* extension) {
-  if (!extension->IsTheme())
+void ExtensionInstallUI::ShowThemeInfoBar(Extension* new_theme) {
+  if (!new_theme->IsTheme())
     return;
 
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
@@ -122,7 +127,7 @@
 
   // Then either replace that old one or add a new one.
   InfoBarDelegate* new_delegate = new ThemePreviewInfobarDelegate(tab_contents,
-      extension->name());
+      new_theme->name(), previous_theme_id_);
 
   if (old_delegate)
     tab_contents->ReplaceInfoBar(old_delegate, new_delegate);
Property changes on: chrome\browser\extensions\extension_install_ui.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/extensions/extension_install_ui.cc:r23055