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

chrome/browser/extensions/extension_install_prompt.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 "chrome/browser/extensions/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.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_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/common/extensions/url_pattern.h"
+#include "content/public/browser/page_navigator.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
-#if defined(USE_ASH)
-#include "ash/shell.h"
-#endif
-
 using extensions::BundleInstaller;
 using extensions::Extension;
 using extensions::PermissionSet;
 
 static const int kTitleIds[ExtensionInstallPrompt::NUM_PROMPT_TYPES] = {
   0,  // The regular install prompt depends on what's being installed.
   IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_RE_ENABLE_PROMPT_TITLE,
   IDS_EXTENSION_PERMISSIONS_PROMPT_TITLE
@@ skipping 196 matching lines @@
 
   return Extension::Create(
       FilePath(),
       Extension::INTERNAL,
       localized_manifest.get() ? *localized_manifest.get() : *manifest,
       Extension::NO_FLAGS,
       id,
       error);
 }
 
-ExtensionInstallPrompt::ExtensionInstallPrompt(Browser* browser)
+ExtensionInstallPrompt::ExtensionInstallPrompt(
+    gfx::NativeWindow parent,
+    content::PageNavigator* navigator,
+    Profile* profile)
     : record_oauth2_grant_(ShouldAutomaticallyApproveScopes()),
-      browser_(browser),
+      parent_(parent),
+      navigator_(navigator),
       ui_loop_(MessageLoop::current()),
       extension_(NULL),
-      install_ui_(ExtensionInstallUI::Create(browser)),
+      install_ui_(ExtensionInstallUI::Create(profile)),
       delegate_(NULL),
       prompt_(UNSET_PROMPT_TYPE),
       prompt_type_(UNSET_PROMPT_TYPE),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
 }
 
 ExtensionInstallPrompt::~ExtensionInstallPrompt() {
 }
 
 void ExtensionInstallPrompt::ConfirmBundleInstall(
@@ skipping 132 matching lines @@
   const Extension::OAuth2Info& oauth2_info = extension_->oauth2_info();
   if (ShouldAutomaticallyApproveScopes() ||
       oauth2_info.client_id.empty() ||
       permissions_->scopes().empty() ||
       prompt_type_ == BUNDLE_INSTALL_PROMPT ||
       prompt_type_ == INLINE_INSTALL_PROMPT) {
     ShowConfirmation();
     return;
   }
 
-  Profile* profile = install_ui_->browser()->profile();
+  Profile* profile = install_ui_->profile();
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile);
   std::vector<std::string> scopes;
   scopes.assign(permissions_->scopes().begin(), permissions_->scopes().end());
 
   token_flow_.reset(new OAuth2MintTokenFlow(
       profile->GetRequestContext(),
       this,
       OAuth2MintTokenFlow::Parameters(
           token_service->GetOAuth2LoginRefreshToken(),
           extension_->id(),
@@ skipping 19 matching lines @@
   prompt_.set_type(prompt_type_);
   prompt_.SetPermissions(permissions_->GetWarningMessages());
 
   switch (prompt_type_) {
     case PERMISSIONS_PROMPT:
     case RE_ENABLE_PROMPT:
     case INLINE_INSTALL_PROMPT:
     case INSTALL_PROMPT: {
       prompt_.set_extension(extension_);
       prompt_.set_icon(gfx::Image(icon_));
-      ShowExtensionInstallDialog(browser_, delegate_, prompt_);
+      ShowExtensionInstallDialog(parent_, navigator_, delegate_, prompt_);
       break;
     }
     case BUNDLE_INSTALL_PROMPT: {
       prompt_.set_bundle(bundle_);
-      ShowExtensionInstallDialog(browser_, delegate_, prompt_);
+      ShowExtensionInstallDialog(parent_, navigator_, delegate_, prompt_);
       break;
     }
     default:
       NOTREACHED() << "Unknown message";
       break;
   }
 }
 
 // static
 bool ExtensionInstallPrompt::ShouldAutomaticallyApproveScopes() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDemandUserScopeApproval);
 }
+
+namespace chrome {
+
+ExtensionInstallPrompt* CreateExtensionInstallPromptWithBrowser(
+    Browser* browser) {
+  // |browser| can be NULL in unit tests.
+  if (!browser)
+    return new ExtensionInstallPrompt(NULL, NULL, NULL);
+  gfx::NativeWindow parent =
+      browser->window() ? browser->window()->GetNativeWindow() : NULL;
+  return new ExtensionInstallPrompt(parent, browser, browser->profile());
+}
+
+}  // namespace chrome