Index: chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h |
diff --git a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h |
index d5c9093c89369f37ad3d84de0ace426c9dea28c8..5ce32622ed4206ef5eeeef6b47c477d59c1e252c 100644 |
--- a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h |
+++ b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h |
@@ -7,21 +7,23 @@ |
#import <Cocoa/Cocoa.h> |
+#include <memory> |
+ |
#include "base/macros.h" |
#include "components/bubble/bubble_ui.h" |
-#include "components/chooser_controller/chooser_controller.h" |
class Browser; |
@class ChooserBubbleUiController; |
+class ChooserController; |
// ChooserBubbleUiCocoa implements a chooser-based permission model. |
// It uses |NSTableView| to show a list of options for user to grant |
// permission. It can be used by the WebUSB or WebBluetooth APIs. |
// It is owned by the BubbleController, which is owned by the BubbleManager. |
-class ChooserBubbleUiCocoa : public BubbleUi, |
- public ChooserController::Observer { |
+class ChooserBubbleUiCocoa : public BubbleUi { |
public: |
- ChooserBubbleUiCocoa(Browser* browser, ChooserController* chooser_controller); |
+ ChooserBubbleUiCocoa(Browser* browser, |
+ std::unique_ptr<ChooserController> chooser_controller); |
~ChooserBubbleUiCocoa() override; |
// BubbleUi: |
@@ -29,17 +31,11 @@ class ChooserBubbleUiCocoa : public BubbleUi, |
void Close() override; |
void UpdateAnchorPosition() override; |
- // ChooserController::Observer: |
- void OnOptionsInitialized() override; |
- void OnOptionAdded(size_t index) override; |
- void OnOptionRemoved(size_t index) override; |
- |
// Called when |chooser_bubble_ui_controller_| is closing. |
void OnBubbleClosing(); |
private: |
- Browser* browser_; // Weak. |
- ChooserController* chooser_controller_; // Weak. |
+ Browser* browser_; // Weak. |
// Cocoa-side chooser bubble UI controller. Weak, as it will close itself. |
ChooserBubbleUiController* chooser_bubble_ui_controller_; |