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

Unified Diff: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

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/views/extensions/extension_install_dialog_view.cc
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index d6e7252ad95ae23ac4d6c4c31f01a8046505221f..f9885221a7024c5b927a88fd1c28c6ce1db65b73 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -10,7 +10,7 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/bundle_installer.h"
-#include "chrome/browser/extensions/extension_install_dialog.h"
+#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/extension.h"
#include "content/public/browser/page_navigator.h"
@@ -172,6 +172,16 @@ class IssueAdviceView : public views::View,
DISALLOW_COPY_AND_ASSIGN(IssueAdviceView);
};
+void ShowExtensionInstallDialogImpl(
+ gfx::NativeWindow parent,
+ content::PageNavigator* navigator,
+ ExtensionInstallPrompt::Delegate* delegate,
+ const ExtensionInstallPrompt::Prompt& prompt) {
+ views::Widget::CreateWindowWithParent(
+ new ExtensionInstallDialogView(navigator, delegate, prompt),
+ parent)->Show();
+}
+
} // namespace
ExtensionInstallDialogView::ExtensionInstallDialogView(
@@ -476,14 +486,10 @@ void ExtensionInstallDialogView::LinkClicked(views::Link* source,
GetWidget()->Close();
}
-void ShowExtensionInstallDialogImpl(
- gfx::NativeWindow parent,
- content::PageNavigator* navigator,
- ExtensionInstallPrompt::Delegate* delegate,
- const ExtensionInstallPrompt::Prompt& prompt) {
- views::Widget::CreateWindowWithParent(
- new ExtensionInstallDialogView(navigator, delegate, prompt),
- parent)->Show();
+// static
+ExtensionInstallPrompt::ShowDialogCallback
+ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
+ return base::Bind(&ShowExtensionInstallDialogImpl);
}
// IssueAdviceView::DetailsView ------------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698