Revert of Unpack theme data from extensions off of UI thread.

chrome/browser/ui/extensions/extension_install_ui_default.cc

 // Copyright (c) 2012 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/ui/extensions/extension_install_ui_default.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 111 matching lines @@
 GURL ErrorInfoBarDelegate::GetLinkURL() const {
   return GURL("https://support.google.com/chrome_webstore/?p=crx_warning");
 }
 
 }  // namespace
 
 ExtensionInstallUIDefault::ExtensionInstallUIDefault(
     content::BrowserContext* context)
     : profile_(Profile::FromBrowserContext(context)),
       skip_post_install_ui_(false),
-      use_app_installed_bubble_(false) {}
+      previous_using_system_theme_(false),
+      use_app_installed_bubble_(false) {
+  // |profile| can be NULL during tests.
+  if (profile_) {
+    // Remember the current theme in case the user presses undo.
+    const Extension* previous_theme =
+        ThemeServiceFactory::GetThemeForProfile(profile_);
+    if (previous_theme)
+      previous_theme_id_ = previous_theme->id();
+    previous_using_system_theme_ =
+        ThemeServiceFactory::GetForProfile(profile_)->UsingSystemTheme();
+  }
+}
 
 ExtensionInstallUIDefault::~ExtensionInstallUIDefault() {}
 
 void ExtensionInstallUIDefault::OnInstallSuccess(const Extension* extension,
                                                  const SkBitmap* icon) {
-  if (skip_post_install_ui_ || extension->is_theme())
+  if (skip_post_install_ui_)
     return;
 
   if (!profile_) {
     // TODO(zelidrag): Figure out what exact conditions cause crash
     // http://crbug.com/159437 and write browser test to cover it.
     NOTREACHED();
     return;
   }
 
+  if (extension->is_theme()) {
+    ThemeInstalledInfoBarDelegate::Create(
+        extension, profile_, previous_theme_id_, previous_using_system_theme_);
+    return;
+  }
+
   // Extensions aren't enabled by default in incognito so we confirm
   // the install in a normal window.
   Profile* current_profile = profile_->GetOriginalProfile();
   if (extension->is_app()) {
     bool use_bubble = false;
 
 #if defined(TOOLKIT_VIEWS)  || defined(OS_MACOSX)
     use_bubble = use_app_installed_bubble_;
 #endif
 
@@ skipping 61 matching lines @@
 
 gfx::NativeWindow ExtensionInstallUIDefault::GetDefaultInstallDialogParent() {
   Browser* browser = chrome::FindLastActiveWithProfile(profile_);
   if (browser) {
     content::WebContents* contents =
         browser->tab_strip_model()->GetActiveWebContents();
     return contents->GetTopLevelNativeWindow();
   }
   return NULL;
 }