Revert of Fix crash when user closes window prior to the "Confirm Install" prompt showing

chrome/browser/extensions/extension_install_prompt.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/extensions/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
-#include "chrome/browser/extensions/extension_install_prompt_show_params.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/extension_install_ui_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_util.h"
@@ skipping 141 matching lines @@
   NOTREACHED();
   return false;
 }
 
 Profile* ProfileForWebContents(content::WebContents* web_contents) {
   if (!web_contents)
     return NULL;
   return Profile::FromBrowserContext(web_contents->GetBrowserContext());
 }
 
+gfx::NativeWindow NativeWindowForWebContents(content::WebContents* contents) {
+  if (!contents)
+    return NULL;
+
+  return contents->GetTopLevelNativeWindow();
+}
+
 }  // namespace
 
 ExtensionInstallPrompt::Prompt::InstallPromptPermissions::
     InstallPromptPermissions() {
 }
 ExtensionInstallPrompt::Prompt::InstallPromptPermissions::
     ~InstallPromptPermissions() {
 }
 
 // static
@@ skipping 410 matching lines @@
     PermissionsType permissions_type) const {
   DCHECK_NE(ALL_PERMISSIONS, permissions_type);
   return permissions_type == REGULAR_PERMISSIONS ? prompt_permissions_
                                                  : withheld_prompt_permissions_;
 }
 
 bool ExtensionInstallPrompt::Prompt::ShouldDisplayRevokeFilesButton() const {
   return !retained_files_.empty();
 }
 
+ExtensionInstallPrompt::ShowParams::ShowParams(content::WebContents* contents)
+    : profile(ProfileForWebContents(contents)),
+      parent_web_contents(contents),
+      parent_window(NativeWindowForWebContents(contents)) {
+}
+
+ExtensionInstallPrompt::ShowParams::ShowParams(Profile* profile,
+                                               gfx::NativeWindow window)
+    : profile(profile),
+      parent_web_contents(NULL),
+      parent_window(window) {
+}
+
 // static
 scoped_refptr<Extension>
     ExtensionInstallPrompt::GetLocalizedExtensionForDisplay(
     const base::DictionaryValue* manifest,
     int flags,
     const std::string& id,
     const std::string& localized_name,
     const std::string& localized_description,
     std::string* error) {
   scoped_ptr<base::DictionaryValue> localized_manifest;
@@ skipping 18 matching lines @@
       error);
 }
 
 ExtensionInstallPrompt::ExtensionInstallPrompt(content::WebContents* contents)
     : profile_(ProfileForWebContents(contents)),
       ui_loop_(base::MessageLoop::current()),
       extension_(NULL),
       bundle_(NULL),
       install_ui_(extensions::CreateExtensionInstallUI(
           ProfileForWebContents(contents))),
-      show_params_(new ExtensionInstallPromptShowParams(contents)),
+      show_params_(contents),
       delegate_(NULL) {
 }
 
 ExtensionInstallPrompt::ExtensionInstallPrompt(Profile* profile,
                                                gfx::NativeWindow native_window)
     : profile_(profile),
       ui_loop_(base::MessageLoop::current()),
       extension_(NULL),
       bundle_(NULL),
       install_ui_(extensions::CreateExtensionInstallUI(profile)),
-      show_params_(
-          new ExtensionInstallPromptShowParams(profile, native_window)),
+      show_params_(profile, native_window),
       delegate_(NULL) {
 }
 
 ExtensionInstallPrompt::~ExtensionInstallPrompt() {
 }
 
 void ExtensionInstallPrompt::ConfirmBundleInstall(
     extensions::BundleInstaller* bundle,
     const PermissionSet* permissions) {
   DCHECK(ui_loop_ == base::MessageLoop::current());
@@ skipping 249 matching lines @@
       break;
     }
     default:
       NOTREACHED() << "Unknown message";
       return;
   }
 
   if (AutoConfirmPrompt(delegate_))
     return;
 
-  if (show_params_->WasParentDestroyed()) {
-    delegate_->InstallUIAbort(false);
-    return;
-  }
-
   if (show_dialog_callback_.is_null())
-    GetDefaultShowDialogCallback().Run(show_params_.get(), delegate_, prompt_);
+    GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
   else
-    show_dialog_callback_.Run(show_params_.get(), delegate_, prompt_);
+    show_dialog_callback_.Run(show_params_, delegate_, prompt_);
 }