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

Unified Diff: chrome/browser/ui/website_settings/chooser_bubble_delegate.h

Issue 2086663003: Change ChooserController ownership model (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed temporary unique ptr at ChooserBubbleUiCocoa 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/website_settings/chooser_bubble_delegate.h
diff --git a/chrome/browser/ui/website_settings/chooser_bubble_delegate.h b/chrome/browser/ui/website_settings/chooser_bubble_delegate.h
index bafc894c2a86aaf14d253150531a385f1126dde6..6538990b6c05e6928a49521ae3d0f8cad432242d 100644
--- a/chrome/browser/ui/website_settings/chooser_bubble_delegate.h
+++ b/chrome/browser/ui/website_settings/chooser_bubble_delegate.h
@@ -20,9 +20,8 @@ class RenderFrameHost;
// class and pass it to BubbleManager::ShowBubble() to show the bubble.
class ChooserBubbleDelegate : public BubbleDelegate {
public:
- explicit ChooserBubbleDelegate(
- content::RenderFrameHost* owner,
- std::unique_ptr<ChooserController> chooser_controller);
+ ChooserBubbleDelegate(content::RenderFrameHost* owner,
+ std::unique_ptr<ChooserController> chooser_controller);
~ChooserBubbleDelegate() override;
// BubbleDelegate:
@@ -30,13 +29,14 @@ class ChooserBubbleDelegate : public BubbleDelegate {
std::unique_ptr<BubbleUi> BuildBubbleUi() override;
const content::RenderFrameHost* OwningFrame() const override;
- ChooserController* chooser_controller() const {
- return chooser_controller_.get();
- }
-
private:
const content::RenderFrameHost* const owning_frame_;
Browser* browser_;
+ // |chooser_controller_| is not owned by this class, it is owned by
+ // ChooserContentView[Cocoa].
+ // This field only temporarily owns the ChooserController. It is moved
+ // into the ChooserContentView[Cocoa] when BuildBubbleUi() is called
+ // and the bubble is shown.
std::unique_ptr<ChooserController> chooser_controller_;
DISALLOW_COPY_AND_ASSIGN(ChooserBubbleDelegate);
« no previous file with comments | « chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc ('k') | components/chooser_controller.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698