components/chooser_controller/chooser_controller.cc - Issue 2086663003: Change ChooserController ownership model

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/chooser_controller/chooser_controller.cc

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:

Index: components/chooser_controller/chooser_controller.cc

diff --git a/components/chooser_controller/chooser_controller.cc b/components/chooser_controller/chooser_controller.cc

index 1d2c3c70118abbef11d99fe3769bbe67e43e2c6c..3099cef5b8b2c8541e06c3291d755762ad6731f3 100644

--- a/components/chooser_controller/chooser_controller.cc

+++ b/components/chooser_controller/chooser_controller.cc

@@ -5,6 +5,7 @@

#include "components/chooser_controller/chooser_controller.h"

#include "content/public/browser/render_frame_host.h"

+#include "url/origin.h"

ChooserController::ChooserController(content::RenderFrameHost* owner)

: owning_frame_(owner) {}

@@ -12,6 +13,6 @@ ChooserController::ChooserController(content::RenderFrameHost* owner)

ChooserController::~ChooserController() {}

url::Origin ChooserController::GetOrigin() const {

- return const_cast<content::RenderFrameHost*>(owning_frame_)

- ->GetLastCommittedOrigin();

+ return owning_frame_ ? owning_frame_->GetLastCommittedOrigin()

+ : url::Origin();

}