Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5999)

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

Issue 11087071: Making ShowExtensionInstallDialog a callback (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android build Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm
index 4af95eb24a14a591b2dd72ce8b6be060b9bea211..a5a6cdb6ce16b0611e3e7b4ad5c0e0a1d795807c 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm
@@ -11,6 +11,30 @@
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+namespace {
+
+void ShowExtensionInstallDialogImpl(
+ gfx::NativeWindow parent,
+ content::PageNavigator* navigator,
+ ExtensionInstallPrompt::Delegate* delegate,
+ const ExtensionInstallPrompt::Prompt& prompt) {
+ // TODO(sail) Update ShowExtensionInstallDialogImpl to take a web contents.
+ Browser* browser = browser::FindBrowserWithWindow(parent);
+ if (!browser)
+ return;
+ TabContents* tab = browser->tab_strip_model()->GetActiveTabContents();
+ if (!tab)
+ return;
+
+ // This object will delete itself when the dialog closes.
+ new ExtensionInstallDialogController(tab->web_contents(),
+ navigator,
+ delegate,
+ prompt);
+}
+
+} // namespace
+
ExtensionInstallDialogController::ExtensionInstallDialogController(
content::WebContents* webContents,
content::PageNavigator* navigator,
@@ -40,22 +64,8 @@ void ExtensionInstallDialogController::InstallUIAbort(bool user_initiated) {
delete this;
}
-void ShowExtensionInstallDialogImpl(
- gfx::NativeWindow parent,
- content::PageNavigator* navigator,
- ExtensionInstallPrompt::Delegate* delegate,
- const ExtensionInstallPrompt::Prompt& prompt) {
- // TODO(sail) Update ShowExtensionInstallDialogImpl to take a web contents.
- Browser* browser = browser::FindBrowserWithWindow(parent);
- if (!browser)
- return;
- TabContents* tab = browser->tab_strip_model()->GetActiveTabContents();
- if (!tab)
- return;
-
- // This object will delete itself when the dialog closes.
- new ExtensionInstallDialogController(tab->web_contents(),
- navigator,
- delegate,
- prompt);
+// static
+ExtensionInstallPrompt::ShowDialogCallback
+ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
+ return base::Bind(&ShowExtensionInstallDialogImpl);
}

Powered by Google App Engine
This is Rietveld 408576698