Move application creation and extension install prompt showing off Browser and onto ExtensionTabHel…

chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <gtk/gtk.h>
 
 #include "base/i18n/rtl.h"
 #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/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/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/extensions/extension.h"
+#include "content/public/browser/page_navigator.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 
 using content::OpenURLParams;
 using extensions::BundleInstaller;
 
@@ skipping 47 matching lines @@
 
 }  // namespace
 
 namespace browser {
 
 // Displays the dialog when constructed, deletes itself when dialog is
 // dismissed. Success/failure is passed back through the
 // ExtensionInstallPrompt::Delegate instance.
 class ExtensionInstallDialog {
  public:
-  ExtensionInstallDialog(Browser* browser,
-                         GtkWindow* parent,
+  ExtensionInstallDialog(gfx::NativeWindow parent,
+                         content::PageNavigator* navigator,
                          ExtensionInstallPrompt::Delegate *delegate,
                          const ExtensionInstallPrompt::Prompt& prompt);
  private:
   ~ExtensionInstallDialog();
 
   CHROMEGTK_CALLBACK_1(ExtensionInstallDialog, void, OnResponse, int);
   CHROMEGTK_CALLBACK_0(ExtensionInstallDialog, void, OnStoreLinkClick);
 
   GtkWidget* CreateWidgetForIssueAdvice(
       const IssueAdviceInfoEntry& issue_advice, int pixel_width);
 
-  Browser* browser_;
+  content::PageNavigator* navigator_;
   ExtensionInstallPrompt::Delegate* delegate_;
   std::string extension_id_;  // Set for INLINE_INSTALL_PROMPT.
   GtkWidget* dialog_;
 };
 
 ExtensionInstallDialog::ExtensionInstallDialog(
-    Browser* browser,
-    GtkWindow* parent,
+    gfx::NativeWindow parent,
+    content::PageNavigator* navigator,
     ExtensionInstallPrompt::Delegate *delegate,
     const ExtensionInstallPrompt::Prompt& prompt)
-    : browser_(browser),
+    : navigator_(navigator),
       delegate_(delegate),
       dialog_(NULL) {
   bool show_permissions = prompt.GetPermissionCount() > 0;
   bool show_oauth_issues = prompt.GetOAuthIssueCount() > 0;
   bool is_inline_install =
       prompt.type() == ExtensionInstallPrompt::INLINE_INSTALL_PROMPT;
   bool is_bundle_install =
       prompt.type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT;
 
   if (is_inline_install)
@@ skipping 186 matching lines @@
   else
     delegate_->InstallUIAbort(true);
 
   gtk_widget_destroy(dialog_);
   delete this;
 }
 
 void ExtensionInstallDialog::OnStoreLinkClick(GtkWidget* sender) {
   GURL store_url(
       extension_urls::GetWebstoreItemDetailURLPrefix() + extension_id_);
-  browser_->OpenURL(OpenURLParams(
+  navigator_->OpenURL(OpenURLParams(
       store_url, content::Referrer(), NEW_FOREGROUND_TAB,
       content::PAGE_TRANSITION_LINK, false));
 
   OnResponse(dialog_, GTK_RESPONSE_CLOSE);
 }
 
 GtkWidget* ExtensionInstallDialog::CreateWidgetForIssueAdvice(
     const IssueAdviceInfoEntry& issue_advice, int pixel_width) {
   GtkWidget* box = gtk_vbox_new(FALSE, ui::kControlSpacing);
   GtkWidget* header = gtk_hbox_new(FALSE, 0);
@@ skipping 46 matching lines @@
   if (arrow)
     gtk_box_pack_start(GTK_BOX(header), arrow, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(header), label, TRUE, TRUE, 0);
 
   return box;
 }
 
 }  // namespace browser
 
 void ShowExtensionInstallDialogImpl(
-    Browser* browser,
+    gfx::NativeWindow parent,
+    content::PageNavigator* navigator,
     ExtensionInstallPrompt::Delegate* delegate,
     const ExtensionInstallPrompt::Prompt& prompt) {
-  BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>(
-      browser->window());
-  if (!browser_window) {
-    delegate->InstallUIAbort(false);
-    return;
-  }
-
-  new browser::ExtensionInstallDialog(browser, browser_window->window(),
-                                      delegate, prompt);
+  new browser::ExtensionInstallDialog(parent, navigator, delegate, prompt);
 }