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

Unified Diff: chrome/browser/extensions/api/permissions/permissions_api.h

Issue 1534123002: [Extensions] Migrate ExtensionInstallPrompt::Delegate to be a callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
Index: chrome/browser/extensions/api/permissions/permissions_api.h
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.h b/chrome/browser/extensions/api/permissions/permissions_api.h
index cff5332671d387d654d0bacf9fe152a77f90447b..47884da13304c1b228c75c02c8b9d56a54e9cda4 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.h
+++ b/chrome/browser/extensions/api/permissions/permissions_api.h
@@ -8,6 +8,7 @@
#include <string>
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "extensions/common/permissions/permission_set.h"
@@ -51,8 +52,7 @@ class PermissionsRemoveFunction : public ChromeSyncExtensionFunction {
};
// chrome.permissions.request
-class PermissionsRequestFunction : public ChromeAsyncExtensionFunction,
- public ExtensionInstallPrompt::Delegate {
+class PermissionsRequestFunction : public ChromeAsyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("permissions.request", PERMISSIONS_REQUEST)
@@ -62,10 +62,6 @@ class PermissionsRequestFunction : public ChromeAsyncExtensionFunction,
static void SetAutoConfirmForTests(bool should_proceed);
static void SetIgnoreUserGestureForTests(bool ignore);
- // ExtensionInstallPrompt::Delegate:
- void InstallUIProceed() override;
- void InstallUIAbort(bool user_initiated) override;
-
protected:
~PermissionsRequestFunction() override;
@@ -73,8 +69,12 @@ class PermissionsRequestFunction : public ChromeAsyncExtensionFunction,
bool RunAsync() override;
private:
+ void OnInstallPromptDone(ExtensionInstallPrompt::Result result);
+
scoped_ptr<ExtensionInstallPrompt> install_ui_;
scoped_ptr<const PermissionSet> requested_permissions_;
+
+ DISALLOW_COPY_AND_ASSIGN(PermissionsRequestFunction);
};
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698