| Index: chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
|
| diff --git a/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h b/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
|
| index c7ea98241bb9666329c8d00da75894646ebbed96..3965ec41266c59b2dcf8494a22073445272b819f 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
|
| +++ b/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/macros.h"
|
| #include "chrome/browser/extensions/extension_install_prompt.h"
|
| +#import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"
|
|
|
| class ExtensionInstallPromptShowParams;
|
| @class ExtensionInstallViewController;
|
| @@ -18,14 +19,13 @@ class ExtensionInstallPromptShowParams;
|
|
|
| // Displays an app or extension install or permissions prompt as a standalone
|
| // NSPanel.
|
| -class WindowedInstallDialogController
|
| - : public ExtensionInstallPrompt::Delegate {
|
| +class WindowedInstallDialogController : public ExtensionInstallViewDelegate {
|
| public:
|
| // Initializes the ExtensionInstallViewController and shows the window. This
|
| // object will delete itself when the window is closed.
|
| WindowedInstallDialogController(
|
| ExtensionInstallPromptShowParams* show_params,
|
| - ExtensionInstallPrompt::Delegate* delegate,
|
| + const ExtensionInstallPrompt::DoneCallback& callback,
|
| scoped_ptr<ExtensionInstallPrompt::Prompt> prompt);
|
| ~WindowedInstallDialogController() override;
|
|
|
| @@ -33,16 +33,17 @@ class WindowedInstallDialogController
|
| // choice is invoked. Releases owned resources, then deletes |this|.
|
| void OnWindowClosing();
|
|
|
| - // ExtensionInstallPrompt::Delegate:
|
| - void InstallUIProceed() override;
|
| - void InstallUIAbort(bool user_initiated) override;
|
| + // ExtensionInstallViewDelegate:
|
| + void OnOkButtonClicked() override;
|
| + void OnCancelButtonClicked() override;
|
| + void OnStoreLinkClicked() override;
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(WindowedInstallDialogControllerBrowserTest,
|
| ShowInstallDialog);
|
| ExtensionInstallViewController* GetViewController();
|
|
|
| - ExtensionInstallPrompt::Delegate* delegate_;
|
| + ExtensionInstallPrompt::DoneCallback done_callback_;
|
| base::scoped_nsobject<WindowedInstallController> install_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WindowedInstallDialogController);
|
|
|