[Extensions] Migrate ExtensionInstallPrompt::Delegate to be a callback

chrome/browser/extensions/api/management/chrome_management_api_delegate.cc

 // Copyright 2014 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/api/management/chrome_management_api_delegate.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 #include "chrome/browser/extensions/chrome_extension_function_details.h"
@@ skipping 23 matching lines @@
 #include "extensions/browser/api/management/management_api_constants.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 
 namespace {
 
 class ManagementSetEnabledFunctionInstallPromptDelegate
-    : public ExtensionInstallPrompt::Delegate,
-      public extensions::InstallPromptDelegate {
+    : public extensions::InstallPromptDelegate {
  public:
   ManagementSetEnabledFunctionInstallPromptDelegate(
-      extensions::ManagementSetEnabledFunction* function,
-      const extensions::Extension* extension)
-      : function_(function) {
-    install_prompt_.reset(
-        new ExtensionInstallPrompt(function->GetSenderWebContents()));
+      content::WebContents* web_contents,
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension,
+      const base::Callback<void(bool)>& callback)
+      : install_prompt_(new ExtensionInstallPrompt(web_contents)),
+        callback_(callback),
+        weak_factory_(this) {
+    install_prompt_.reset(new ExtensionInstallPrompt(web_contents));

[asargent_no_longer_on_chrome, 2015/12/31 00:45:56]

nit: looks like you're initializing install_prompt_ twice (once in initializer
list above, and once here)

[Devlin, 2016/01/04 22:59:22]

Whoops, thanks!

     ExtensionInstallPrompt::PromptType type =
         ExtensionInstallPrompt::GetReEnablePromptTypeForExtension(
-            function->browser_context(), extension);
+            browser_context, extension);
     install_prompt_->ShowDialog(
-        this, extension, nullptr,
+        base::Bind(&ManagementSetEnabledFunctionInstallPromptDelegate::
+                       OnInstallPromptDone,
+                   weak_factory_.GetWeakPtr()),
+        extension, nullptr,
         make_scoped_ptr(new ExtensionInstallPrompt::Prompt(type)),
         ExtensionInstallPrompt::GetDefaultShowDialogCallback());
   }
   ~ManagementSetEnabledFunctionInstallPromptDelegate() override {}
 
- protected:
-  // ExtensionInstallPrompt::Delegate.
-  void InstallUIProceed() override { function_->InstallUIProceed(); }
-  void InstallUIAbort(bool user_initiated) override {
-    function_->InstallUIAbort(user_initiated);
+ private:
+  void OnInstallPromptDone(ExtensionInstallPrompt::Result result) {
+    callback_.Run(result == ExtensionInstallPrompt::Result::ACCEPTED);
   }
 
- private:
   extensions::ManagementSetEnabledFunction* function_;

[asargent_no_longer_on_chrome, 2015/12/31 00:45:56]

Can you get rid of function_? Looks like we aren't using it anymore?

[Devlin, 2016/01/04 22:59:22]

Done.

 
   // Used for prompting to re-enable items with permissions escalation updates.
   scoped_ptr<ExtensionInstallPrompt> install_prompt_;
 
+  base::Callback<void(bool)> callback_;
+
+  base::WeakPtrFactory<ManagementSetEnabledFunctionInstallPromptDelegate>
+      weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ManagementSetEnabledFunctionInstallPromptDelegate);
 };
 
 class ManagementUninstallFunctionUninstallDialogDelegate
     : public extensions::ExtensionUninstallDialog::Delegate,
       public extensions::UninstallDialogDelegate {
  public:
   ManagementUninstallFunctionUninstallDialogDelegate(
       extensions::ManagementUninstallFunctionBase* function,
       const extensions::Extension* target_extension,
@@ skipping 116 matching lines @@
               OnParseSuccess,
           function),
       base::Bind(
           &extensions::ManagementGetPermissionWarningsByManifestFunction::
               OnParseFailure,
           function));
 }
 
 scoped_ptr<extensions::InstallPromptDelegate>
 ChromeManagementAPIDelegate::SetEnabledFunctionDelegate(
-    extensions::ManagementSetEnabledFunction* function,
-    const extensions::Extension* extension) const {
+    content::WebContents* web_contents,
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    const base::Callback<void(bool)>& callback) const {
   return scoped_ptr<ManagementSetEnabledFunctionInstallPromptDelegate>(
-      new ManagementSetEnabledFunctionInstallPromptDelegate(function,
-                                                            extension));
+      new ManagementSetEnabledFunctionInstallPromptDelegate(
+          web_contents, browser_context, extension, callback));
 }
 
 scoped_ptr<extensions::RequirementsChecker>
 ChromeManagementAPIDelegate::CreateRequirementsChecker() const {
   return make_scoped_ptr(new extensions::ChromeRequirementsChecker());
 }
 
 scoped_ptr<extensions::UninstallDialogDelegate>
 ChromeManagementAPIDelegate::UninstallFunctionDelegate(
     extensions::ManagementUninstallFunctionBase* function,
@@ skipping 98 matching lines @@
 
 GURL ChromeManagementAPIDelegate::GetIconURL(
     const extensions::Extension* extension,
     int icon_size,
     ExtensionIconSet::MatchType match,
     bool grayscale,
     bool* exists) const {
   return extensions::ExtensionIconSource::GetIconURL(extension, icon_size,
                                                      match, grayscale, exists);
 }