Display dialog when app install succeeds / fails on Athena

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/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
-#include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/extensions/extension_install_ui_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/image_loader.h"
+#include "extensions/browser/install/extension_install_ui.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permission_set.h"
@@ skipping 612 matching lines @@
   return Extension::Create(
       base::FilePath(),
       Manifest::INTERNAL,
       localized_manifest.get() ? *localized_manifest.get() : *manifest,
       flags,
       id,
       error);
 }
 
 ExtensionInstallPrompt::ExtensionInstallPrompt(content::WebContents* contents)
-    : ui_loop_(base::MessageLoop::current()),
+    : profile_(ProfileForWebContents(contents)),
+      ui_loop_(base::MessageLoop::current()),
       extension_(NULL),
       bundle_(NULL),
-      install_ui_(ExtensionInstallUI::Create(ProfileForWebContents(contents))),
+      install_ui_(extensions::CreateExtensionInstallUI(
+          ProfileForWebContents(contents))),
       show_params_(contents),
       delegate_(NULL) {
 }
 
 ExtensionInstallPrompt::ExtensionInstallPrompt(
     Profile* profile,
     gfx::NativeWindow native_window,
     content::PageNavigator* navigator)
-    : ui_loop_(base::MessageLoop::current()),
+    : profile_(profile),
+      ui_loop_(base::MessageLoop::current()),
       extension_(NULL),
       bundle_(NULL),
-      install_ui_(ExtensionInstallUI::Create(profile)),
+      install_ui_(extensions::CreateExtensionInstallUI(profile)),
       show_params_(native_window, navigator),
       delegate_(NULL) {
 }
 
 ExtensionInstallPrompt::~ExtensionInstallPrompt() {
 }
 
 void ExtensionInstallPrompt::ConfirmBundleInstall(
     extensions::BundleInstaller* bundle,
     const PermissionSet* permissions) {
@@ skipping 59 matching lines @@
 
   LoadImageIfNeeded();
 }
 
 void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate,
                                              const Extension* extension) {
   DCHECK(ui_loop_ == base::MessageLoop::current());
   extension_ = extension;
   delegate_ = delegate;
   bool is_remote_install =
-      install_ui_->profile() &&
-      extensions::ExtensionPrefs::Get(install_ui_->profile())->HasDisableReason(
+      profile_ &&
+      extensions::ExtensionPrefs::Get(profile_)->HasDisableReason(
           extension->id(), extensions::Extension::DISABLE_REMOTE_INSTALL);
   bool is_ephemeral =
-      extensions::util::IsEphemeralApp(extension->id(), install_ui_->profile());
+      extensions::util::IsEphemeralApp(extension->id(), profile_);
 
   PromptType type = UNSET_PROMPT_TYPE;
   if (is_ephemeral)
     type = LAUNCH_PROMPT;
   else if (is_remote_install)
     type = REMOTE_INSTALL_PROMPT;
   else
     type = RE_ENABLE_PROMPT;
   prompt_ = new Prompt(type);
 
@@ skipping 68 matching lines @@
   }
 }
 
 void ExtensionInstallPrompt::OnImageLoaded(const gfx::Image& image) {
   SetIcon(image.IsEmpty() ? NULL : image.ToSkBitmap());
   ShowConfirmation();
 }
 
 void ExtensionInstallPrompt::LoadImageIfNeeded() {
   // Bundle install prompts do not have an icon.
-  // Also |install_ui_.profile()| can be NULL in unit tests.
-  if (!icon_.empty() || !install_ui_->profile()) {
+  // Also |profile_| can be NULL in unit tests.
+  if (!icon_.empty() || !profile_) {
     ShowConfirmation();
     return;
   }
 
   extensions::ExtensionResource image = extensions::IconsInfo::GetIconResource(
       extension_,
       extension_misc::EXTENSION_ICON_LARGE,
       ExtensionIconSet::MATCH_BIGGER);
 
   // Load the image asynchronously. The response will be sent to OnImageLoaded.
-  extensions::ImageLoader* loader =
-      extensions::ImageLoader::Get(install_ui_->profile());
+  extensions::ImageLoader* loader = extensions::ImageLoader::Get(profile_);
 
   std::vector<extensions::ImageLoader::ImageRepresentation> images_list;
   images_list.push_back(extensions::ImageLoader::ImageRepresentation(
       image,
       extensions::ImageLoader::ImageRepresentation::NEVER_RESIZE,
       gfx::Size(),
       ui::SCALE_FACTOR_100P));
   loader->LoadImagesAsync(
       extension_,
       images_list,
       base::Bind(&ExtensionInstallPrompt::OnImageLoaded, AsWeakPtr()));
 }
 
 void ExtensionInstallPrompt::ShowConfirmation() {
   if (prompt_->type() == INSTALL_PROMPT)
     prompt_->set_experiment(ExtensionInstallPromptExperiment::Find());
   else
     prompt_->set_experiment(ExtensionInstallPromptExperiment::ControlGroup());
 
   scoped_refptr<const PermissionSet> permissions_to_display;
   if (custom_permissions_.get()) {
     permissions_to_display = custom_permissions_;
   } else if (extension_) {
     // Initialize permissions if they have not already been set so that
     // withheld permissions are displayed properly in the install prompt.
     extensions::PermissionsUpdater(
-        install_ui_->profile(),
-        extensions::PermissionsUpdater::INIT_FLAG_TRANSIENT)
+        profile_, extensions::PermissionsUpdater::INIT_FLAG_TRANSIENT)
         .InitializePermissions(extension_);
     permissions_to_display =
         extension_->permissions_data()->active_permissions();
   }
 
   if (permissions_to_display.get() &&
       (!extension_ ||
        !extensions::PermissionsData::ShouldSkipPermissionWarnings(
            extension_->id()))) {
     Manifest::Type type =
@@ skipping 43 matching lines @@
   }
 
   if (AutoConfirmPrompt(delegate_))
     return;
 
   if (show_dialog_callback_.is_null())
     GetDefaultShowDialogCallback().Run(show_params_, delegate_, prompt_);
   else
     show_dialog_callback_.Run(show_params_, delegate_, prompt_);
 }