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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h

Issue 662073002: Fix crash when user closes window prior to the "Confirm Install" prompt showing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/install_prompt_navigator
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_WINDOWED_INSTALL_DIALOG_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_WINDOWED_INSTALL_DIALOG_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_WINDOWED_INSTALL_DIALOG_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_WINDOWED_INSTALL_DIALOG_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/mac/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 #include "chrome/browser/extensions/extension_install_prompt.h" 12 #include "chrome/browser/extensions/extension_install_prompt.h"
13 13
14 class ExtensionInstallPromptShowParams;
14 @class ExtensionInstallViewController; 15 @class ExtensionInstallViewController;
15 @class WindowedInstallController; 16 @class WindowedInstallController;
16 17
17 // Displays an app or extension install or permissions prompt as a standalone 18 // Displays an app or extension install or permissions prompt as a standalone
18 // NSPanel. 19 // NSPanel.
19 class WindowedInstallDialogController 20 class WindowedInstallDialogController
20 : public ExtensionInstallPrompt::Delegate { 21 : public ExtensionInstallPrompt::Delegate {
21 public: 22 public:
22 // Initializes the ExtensionInstallViewController and shows the window. This 23 // Initializes the ExtensionInstallViewController and shows the window. This
23 // object will delete itself when the window is closed. 24 // object will delete itself when the window is closed.
24 WindowedInstallDialogController( 25 WindowedInstallDialogController(
25 const ExtensionInstallPrompt::ShowParams& show_params, 26 ExtensionInstallPromptShowParams* show_params,
26 ExtensionInstallPrompt::Delegate* delegate, 27 ExtensionInstallPrompt::Delegate* delegate,
27 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt); 28 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt);
28 ~WindowedInstallDialogController() override; 29 ~WindowedInstallDialogController() override;
29 30
30 // Invoked by the -[NSWindow windowWillClose:] notification after a dialog 31 // Invoked by the -[NSWindow windowWillClose:] notification after a dialog
31 // choice is invoked. Releases owned resources, then deletes |this|. 32 // choice is invoked. Releases owned resources, then deletes |this|.
32 void OnWindowClosing(); 33 void OnWindowClosing();
33 34
34 // ExtensionInstallPrompt::Delegate: 35 // ExtensionInstallPrompt::Delegate:
35 void InstallUIProceed() override; 36 void InstallUIProceed() override;
36 void InstallUIAbort(bool user_initiated) override; 37 void InstallUIAbort(bool user_initiated) override;
37 38
38 private: 39 private:
39 FRIEND_TEST_ALL_PREFIXES(WindowedInstallDialogControllerBrowserTest, 40 FRIEND_TEST_ALL_PREFIXES(WindowedInstallDialogControllerBrowserTest,
40 ShowInstallDialog); 41 ShowInstallDialog);
41 ExtensionInstallViewController* GetViewController(); 42 ExtensionInstallViewController* GetViewController();
42 43
43 ExtensionInstallPrompt::Delegate* delegate_; 44 ExtensionInstallPrompt::Delegate* delegate_;
44 base::scoped_nsobject<WindowedInstallController> install_controller_; 45 base::scoped_nsobject<WindowedInstallController> install_controller_;
45 46
46 DISALLOW_COPY_AND_ASSIGN(WindowedInstallDialogController); 47 DISALLOW_COPY_AND_ASSIGN(WindowedInstallDialogController);
47 }; 48 };
48 49
49 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_WINDOWED_INSTALL_DIALOG_CONTROLLER _H_ 50 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_WINDOWED_INSTALL_DIALOG_CONTROLLER _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698