chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm - 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: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

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

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.mm ('k') | chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

index 19d03b1ddd91d1cce91c64fd9afbd2f0bf0f7525..123ab5429147ae253d1cdcac660a8be9c4224a29 100644

--- a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

@@ -35,11 +35,12 @@ class ChooserDialogCocoaControllerTest : public CocoaProfileTest {

content::WebContents::Create(content::WebContents::CreateParams(

profile(), content::SiteInstance::Create(profile())));

ASSERT_TRUE(web_contents);

- chooser_controller_.reset(

+ std::unique_ptr<MockChooserController> chooser_controller(

new MockChooserController(web_contents->GetMainFrame()));

- ASSERT_TRUE(chooser_controller_);

+ ASSERT_TRUE(chooser_controller);

+ chooser_controller_ = chooser_controller.get();

chooser_dialog_.reset(

- new ChooserDialogCocoa(web_contents, chooser_controller_.get()));

+ new ChooserDialogCocoa(web_contents, std::move(chooser_controller)));

ASSERT_TRUE(chooser_dialog_);

chooser_dialog_controller_ =

chooser_dialog_->chooser_dialog_cocoa_controller_.get();

@@ -56,9 +57,9 @@ class ChooserDialogCocoaControllerTest : public CocoaProfileTest {

ASSERT_TRUE(help_button_);

}

- std::unique_ptr<MockChooserController> chooser_controller_;

std::unique_ptr<ChooserDialogCocoa> chooser_dialog_;

+ MockChooserController* chooser_controller_;

ChooserDialogCocoaController* chooser_dialog_controller_;

ChooserContentViewCocoa* chooser_content_view_;

NSTableView* table_view_;