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

chrome/browser/extensions/extension_install_ui.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_install_ui.h"
 
 #include <map>
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
@@ skipping 19 matching lines @@
 
 void ExtensionInstallUI::ConfirmInstall(CrxInstaller* installer,
                                         Extension* extension,
                                         SkBitmap* install_icon) {
   DCHECK(ui_loop_ == MessageLoop::current());
 
   // We special-case themes to not show any confirm UI. Instead they are
   // 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;
   }
 
 #if defined(OS_WIN)
   ShowExtensionInstallPrompt(profile_, installer, extension, install_icon);
 
 #elif defined(OS_MACOSX)
   // TODO(port): Implement nicer UI.
   // Using CoreFoundation to do this dialog is unimaginably lame but will do
@@ skipping 41 matching lines @@
 #else
   LOG(ERROR) << "Extension install failed: " << error.c_str();
   NOTREACHED();
 #endif
 }
 
 void ExtensionInstallUI::OnOverinstallAttempted(Extension* extension) {
   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_);
   if (!browser)
     return;
 
   TabContents* tab_contents = browser->GetSelectedTabContents();
   if (!tab_contents)
     return;
 
   // First find any previous theme preview infobars.
   InfoBarDelegate* old_delegate = NULL;
   for (int i = 0; i < tab_contents->infobar_delegate_count(); ++i) {
     InfoBarDelegate* delegate = tab_contents->GetInfoBarDelegateAt(i);
     if (delegate->AsThemePreviewInfobarDelegate()) {
       old_delegate = delegate;
       break;
     }
   }
 
   // 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);
   else
     tab_contents->AddInfoBar(new_delegate);
 }