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

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

Issue 683993002: Revert of 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_EXTENSION_INSTALL_DIALOG_CONTROLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALL_DIALOG_CONTROLER_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALL_DIALOG_CONTROLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALL_DIALOG_CONTROLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "chrome/browser/extensions/extension_install_prompt.h" 11 #include "chrome/browser/extensions/extension_install_prompt.h"
12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" 12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
13 13
14 namespace content { 14 namespace content {
15 class PageNavigator; 15 class PageNavigator;
16 class WebContents; 16 class WebContents;
17 } 17 }
18 18
19 namespace extensions { 19 namespace extensions {
20 class ExperienceSamplingEvent; 20 class ExperienceSamplingEvent;
21 } 21 }
22 22
23 class ExtensionInstallPromptShowParams;
24 @class ExtensionInstallViewController; 23 @class ExtensionInstallViewController;
25 24
26 // Displays an extension install prompt as a tab modal dialog. 25 // Displays an extension install prompt as a tab modal dialog.
27 class ExtensionInstallDialogController : 26 class ExtensionInstallDialogController :
28 public ExtensionInstallPrompt::Delegate, 27 public ExtensionInstallPrompt::Delegate,
29 public ConstrainedWindowMacDelegate { 28 public ConstrainedWindowMacDelegate {
30 public: 29 public:
31 ExtensionInstallDialogController( 30 ExtensionInstallDialogController(
32 ExtensionInstallPromptShowParams* show_params, 31 const ExtensionInstallPrompt::ShowParams& show_params,
33 ExtensionInstallPrompt::Delegate* delegate, 32 ExtensionInstallPrompt::Delegate* delegate,
34 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt); 33 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt);
35 ~ExtensionInstallDialogController() override; 34 ~ExtensionInstallDialogController() override;
36 35
37 // ExtensionInstallPrompt::Delegate implementation. 36 // ExtensionInstallPrompt::Delegate implementation.
38 void InstallUIProceed() override; 37 void InstallUIProceed() override;
39 void InstallUIAbort(bool user_initiated) override; 38 void InstallUIAbort(bool user_initiated) override;
40 39
41 // ConstrainedWindowMacDelegate implementation. 40 // ConstrainedWindowMacDelegate implementation.
42 void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override; 41 void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
43 42
44 ConstrainedWindowMac* constrained_window() const { 43 ConstrainedWindowMac* constrained_window() const {
45 return constrained_window_.get(); 44 return constrained_window_.get();
46 } 45 }
47 ExtensionInstallViewController* view_controller() const { 46 ExtensionInstallViewController* view_controller() const {
48 return view_controller_; 47 return view_controller_;
49 } 48 }
50 49
51 private: 50 private:
52 ExtensionInstallPrompt::Delegate* delegate_; 51 ExtensionInstallPrompt::Delegate* delegate_;
53 base::scoped_nsobject<ExtensionInstallViewController> view_controller_; 52 base::scoped_nsobject<ExtensionInstallViewController> view_controller_;
54 scoped_ptr<ConstrainedWindowMac> constrained_window_; 53 scoped_ptr<ConstrainedWindowMac> constrained_window_;
55 scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_; 54 scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
56 }; 55 };
57 56
58 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALL_DIALOG_CONTROLLE R_H_ 57 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALL_DIALOG_CONTROLLE R_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698