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

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

Issue 10699057: Move application creation and extension install prompt showing off Browser and onto ExtensionTabHel… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
« no previous file with comments | « chrome/browser/ui/views/browser_dialogs.h ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
===================================================================
--- chrome/browser/ui/views/extensions/extension_install_dialog_view.cc (revision 145357)
+++ chrome/browser/ui/views/extensions/extension_install_dialog_view.cc (working copy)
@@ -12,10 +12,8 @@
#include "chrome/browser/extensions/bundle_installer.h"
#include "chrome/browser/extensions/extension_install_dialog.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_window.h"
#include "chrome/common/extensions/extension.h"
+#include "content/public/browser/page_navigator.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -75,7 +73,7 @@
class ExtensionInstallDialogView : public views::DialogDelegateView,
public views::LinkListener {
public:
- ExtensionInstallDialogView(Browser* browser,
+ ExtensionInstallDialogView(content::PageNavigator* navigator,
ExtensionInstallPrompt::Delegate* delegate,
const ExtensionInstallPrompt::Prompt& prompt);
virtual ~ExtensionInstallDialogView();
@@ -103,7 +101,7 @@
return prompt_.type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT;
}
- Browser* browser_;
+ content::PageNavigator* navigator_;
ExtensionInstallPrompt::Delegate* delegate_;
ExtensionInstallPrompt::Prompt prompt_;
@@ -111,10 +109,10 @@
};
ExtensionInstallDialogView::ExtensionInstallDialogView(
- Browser* browser,
+ content::PageNavigator* navigator,
ExtensionInstallPrompt::Delegate* delegate,
const ExtensionInstallPrompt::Prompt& prompt)
- : browser_(browser),
+ : navigator_(navigator),
delegate_(delegate),
prompt_(prompt) {
// Possible grid layouts:
@@ -349,24 +347,16 @@
OpenURLParams params(
store_url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK,
false);
- browser_->OpenURL(params);
+ navigator_->OpenURL(params);
GetWidget()->Close();
}
void ShowExtensionInstallDialogImpl(
- Browser* browser,
+ gfx::NativeWindow parent,
+ content::PageNavigator* navigator,
ExtensionInstallPrompt::Delegate* delegate,
const ExtensionInstallPrompt::Prompt& prompt) {
- BrowserWindow* browser_window = browser->window();
- if (!browser_window) {
- delegate->InstallUIAbort(false);
- return;
- }
-
- ExtensionInstallDialogView* dialog = new ExtensionInstallDialogView(
- browser, delegate, prompt);
-
- views::Widget* window = views::Widget::CreateWindowWithParent(
- dialog, browser_window->GetNativeWindow());
- window->Show();
+ views::Widget::CreateWindowWithParent(
+ new ExtensionInstallDialogView(navigator, delegate, prompt),
+ parent)->Show();
}
« no previous file with comments | « chrome/browser/ui/views/browser_dialogs.h ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698