Mac Web Intents Part 15: Inline extension install prompt (model)

chrome/browser/extensions/extension_install_prompt.cc

Index: chrome/browser/extensions/extension_install_prompt.cc
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 48db2863b3421359c61a12d14409d0af42a5d25b..d0365bbe012ae98bda334792730fdfb4748445f7 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -355,16 +355,19 @@ void ExtensionInstallPrompt::ConfirmWebstoreInstall(Delegate* delegate,
   // remaining fields.
   extension_ = extension;
   SetIcon(icon);
-  ConfirmInstall(delegate, extension);
+  ConfirmInstall(delegate, extension, ShowDialogCallback());
 }
 
-void ExtensionInstallPrompt::ConfirmInstall(Delegate* delegate,
-                                            const Extension* extension) {
+void ExtensionInstallPrompt::ConfirmInstall(
+    Delegate* delegate,
+    const Extension* extension,
+    const ShowDialogCallback& show_dialog_callback) {
   DCHECK(ui_loop_ == MessageLoop::current());
   extension_ = extension;
   permissions_ = extension->GetActivePermissions();
   delegate_ = delegate;
   prompt_type_ = INSTALL_PROMPT;
+  show_dialog_callback_ = show_dialog_callback;
 
   // We special-case themes to not show any confirm UI. Instead they are
   // immediately installed, and then we show an infobar (see OnInstallSuccess)
@@ -537,12 +540,20 @@ void ExtensionInstallPrompt::ShowConfirmation() {
     case INSTALL_PROMPT: {
       prompt_.set_extension(extension_);
       prompt_.set_icon(gfx::Image(icon_));
-      ShowExtensionInstallDialog(parent_, navigator_, delegate_, prompt_);
+      ShowExtensionInstallDialog(parent_,
+                                 navigator_,
+                                 delegate_,
+                                 prompt_,
+                                 show_dialog_callback_);
       break;
     }
     case BUNDLE_INSTALL_PROMPT: {
       prompt_.set_bundle(bundle_);
-      ShowExtensionInstallDialog(parent_, navigator_, delegate_, prompt_);
+      ShowExtensionInstallDialog(parent_,
+                                 navigator_,
+                                 delegate_,
+                                 prompt_,
+                                 show_dialog_callback_);
       break;
     }
     default: