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

chrome/browser/extensions/extension_install_dialog.cc

Index: chrome/browser/extensions/extension_install_dialog.cc
diff --git a/chrome/browser/extensions/extension_install_dialog.cc b/chrome/browser/extensions/extension_install_dialog.cc
index a3cd87bf911ec99916e8988d0b5bd51e1665fcee..ef1e2a4ed1fdc9019b77531ab665f6655453bcca 100644
--- a/chrome/browser/extensions/extension_install_dialog.cc
+++ b/chrome/browser/extensions/extension_install_dialog.cc
@@ -59,14 +59,20 @@ AutoConfirmForTest CheckAutoConfirmCommandLineSwitch() {
 
 }  // namespace
 
-void ShowExtensionInstallDialog(gfx::NativeWindow parent,
-                                content::PageNavigator* navigator,
-                                ExtensionInstallPrompt::Delegate* delegate,
-                                const ExtensionInstallPrompt::Prompt& prompt) {
+void ShowExtensionInstallDialog(
+    gfx::NativeWindow parent,
+    content::PageNavigator* navigator,
+    ExtensionInstallPrompt::Delegate* delegate,
+    const ExtensionInstallPrompt::Prompt& prompt,
+    const ExtensionInstallPrompt::ShowDialogCallback& show_dialog_callback) {
   AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch();
   if (auto_confirm != DO_NOT_SKIP) {
     DoAutoConfirm(auto_confirm, delegate);
     return;
   }
+  if (!show_dialog_callback.is_null()) {
+    show_dialog_callback.Run(parent, navigator, delegate, prompt);
+    return;
+  }
   ShowExtensionInstallDialogImpl(parent, navigator, delegate, prompt);

[Greg Billock, 2012/10/03 17:20:35]

Can this just use the same mechanism, so there's only one code path and it
always invokes the callback?

[Mihai Parparita -not on Chrome, 2012/10/03 19:57:51]

+1

We already have two ways in which different UIs can be triggered (by platform,
and by prompt type). Adding a third makes things even more confusing.

[sail, 2012/10/03 20:24:29]

Done.

 }