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

chrome/browser/extensions/extension_install_prompt.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/extensions/extension_install_prompt_experiment.h"
 #include "extensions/common/url_pattern.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 
-class ExtensionInstallPromptShowParams;
 class Profile;
 
 namespace base {
 class DictionaryValue;
 class MessageLoop;
 }  // namespace base
 
 namespace content {
 class WebContents;
 }
@@ skipping 237 matching lines @@
     virtual void InstallUIProceed() = 0;
 
     // We call this method to signal that the installation should stop, with
     // |user_initiated| true if the installation was stopped by the user.
     virtual void InstallUIAbort(bool user_initiated) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
-  typedef base::Callback<void(ExtensionInstallPromptShowParams*,
+  // Parameters to show a prompt dialog. Two sets of the
+  // parameters are supported: either use a parent WebContents or use a
+  // parent NativeWindow + a Profile.
+  struct ShowParams {
+    explicit ShowParams(content::WebContents* contents);
+    ShowParams(Profile* profile, gfx::NativeWindow window);
+
+    Profile* profile;
+
+    // Parent web contents of the install UI dialog. This can be NULL.
+    content::WebContents* parent_web_contents;
+
+    // NativeWindow parent.
+    gfx::NativeWindow parent_window;
+  };
+
+  typedef base::Callback<void(const ExtensionInstallPrompt::ShowParams&,
                               ExtensionInstallPrompt::Delegate*,
                               scoped_refptr<ExtensionInstallPrompt::Prompt>)>
       ShowDialogCallback;
 
   // Callback to show the default extension install dialog.
   // The implementations of this function are platform-specific.
   static ShowDialogCallback GetDefaultShowDialogCallback();
 
   // Creates a dummy extension from the |manifest|, replacing the name and
   // description with the localizations if provided.
@@ skipping 12 matching lines @@
   // active browser window (or a new browser window if there are no browser
   // windows) is used if a new tab needs to be opened.
   ExtensionInstallPrompt(Profile* profile, gfx::NativeWindow native_window);
 
   virtual ~ExtensionInstallPrompt();
 
   extensions::ExtensionInstallUI* install_ui() const {
     return install_ui_.get();
   }
 
+  content::WebContents* parent_web_contents() const {
+    return show_params_.parent_web_contents;
+  }
+
   // This is called by the bundle installer to verify whether the bundle
   // should be installed.
   //
   // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
   virtual void ConfirmBundleInstall(
       extensions::BundleInstaller* bundle,
       const extensions::PermissionSet* permissions);
 
   // This is called by the standalone installer to verify whether the install
   // from the webstore should proceed.
@@ skipping 110 matching lines @@
   const extensions::BundleInstaller* bundle_;
 
   // A custom set of permissions to show in the install prompt instead of the
   // extension's active permissions.
   scoped_refptr<const extensions::PermissionSet> custom_permissions_;
 
   // The object responsible for doing the UI specific actions.
   scoped_ptr<extensions::ExtensionInstallUI> install_ui_;
 
   // Parameters to show the confirmation UI.
-  scoped_ptr<ExtensionInstallPromptShowParams> show_params_;
+  ShowParams show_params_;
 
   // The delegate we will call Proceed/Abort on after confirmation UI.
   Delegate* delegate_;
 
   // A pre-filled prompt.
   scoped_refptr<Prompt> prompt_;
 
   // Used to show the confirm dialog.
   ShowDialogCallback show_dialog_callback_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_