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

Unified Diff: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h

Issue 2086663003: Change ChooserController ownership model (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address reillyg@'s comments Created 4 years, 6 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/ui/cocoa/extensions/chooser_dialog_cocoa.h
diff --git a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h
index 433737350a338d6aeb0c67efbd69180a9a03bcc7..80ad888e7067476713c804e3e1d04e5bd81cc036 100644
--- a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h
+++ b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h
@@ -7,33 +7,29 @@
#import <Cocoa/Cocoa.h>
+#include <memory>
+
#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
-#include "components/chooser_controller/chooser_controller.h"
+
+class ChooserController;
+@class ChooserDialogCocoaController;
namespace content {
class WebContents;
}
-@class ChooserDialogCocoaController;
-
// Displays a chooser dialog as a modal sheet constrained
// to the window/tab displaying the given web contents.
-class ChooserDialogCocoa : public ConstrainedWindowMacDelegate,
- public ChooserController::Observer {
+class ChooserDialogCocoa : public ConstrainedWindowMacDelegate {
public:
ChooserDialogCocoa(content::WebContents* web_contents,
- ChooserController* chooser_controller);
- ~ChooserDialogCocoa() override;
+ std::unique_ptr<ChooserController> chooser_controller);
+ virtual ~ChooserDialogCocoa();
// ConstrainedWindowMacDelegate:
void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
- // ChooserController::Observer:
- void OnOptionsInitialized() override;
- void OnOptionAdded(size_t index) override;
- void OnOptionRemoved(size_t index) override;
-
// Create and show the modal dialog.
void ShowDialog();
@@ -47,8 +43,7 @@ class ChooserDialogCocoa : public ConstrainedWindowMacDelegate,
base::scoped_nsobject<ChooserDialogCocoaController>
chooser_dialog_cocoa_controller_;
std::unique_ptr<ConstrainedWindowMac> constrained_window_;
- content::WebContents* web_contents_; // Weak.
- ChooserController* chooser_controller_; // Weak.
+ content::WebContents* web_contents_; // Weak.
};
#endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_CHOOSER_DIALOG_COCOA_H_

Powered by Google App Engine
This is Rietveld 408576698