chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.mm - Issue 313203004: Make ExtensionInstallPrompt::Prompt ref-counted

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/windowed_install_dialog_controller.mm

Issue 313203004: Make ExtensionInstallPrompt::Prompt ref-counted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Latest master Created 6 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

« chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm ('K') | « chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h ('k') | chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d1128ab63e571fb568518f3550d579cba1d4c850..c4578693582212152b07e79db73e58701013e22c 100644

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

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

@@ -21,14 +21,14 @@

- (id)initWithNavigator:(content::PageNavigator*)navigator

delegate:(WindowedInstallDialogController*)delegate

- prompt:(const ExtensionInstallPrompt::Prompt&)prompt;

+ prompt:(scoped_refptr<ExtensionInstallPrompt::Prompt>)prompt;

@end

WindowedInstallDialogController::WindowedInstallDialogController(

const ExtensionInstallPrompt::ShowParams& show_params,

ExtensionInstallPrompt::Delegate* delegate,

- const ExtensionInstallPrompt::Prompt& prompt)

+ scoped_refptr<ExtensionInstallPrompt::Prompt> prompt)

: delegate_(delegate) {

install_controller_.reset([[WindowedInstallController alloc]

initWithNavigator:show_params.navigator

@@ -72,7 +72,7 @@ void WindowedInstallDialogController::InstallUIAbort(bool user_initiated) {

- (id)initWithNavigator:(content::PageNavigator*)navigator

delegate:(WindowedInstallDialogController*)delegate

- prompt:(const ExtensionInstallPrompt::Prompt&)prompt {

+ prompt:(scoped_refptr<ExtensionInstallPrompt::Prompt>)prompt {

base::scoped_nsobject<NSWindow> controlledPanel(

[[NSPanel alloc] initWithContentRect:ui::kWindowSizeDeterminedLater

styleMask:NSTitledWindowMask

@@ -94,7 +94,7 @@ void WindowedInstallDialogController::InstallUIAbort(bool user_initiated) {

if ([window respondsToSelector:@selector(setAnimationBehavior:)])

[window setAnimationBehavior:NSWindowAnimationBehaviorAlertPanel];

- [window setTitle:base::SysUTF16ToNSString(prompt.GetDialogTitle())];

+ [window setTitle:base::SysUTF16ToNSString(prompt->GetDialogTitle())];

NSRect viewFrame = [[installViewController_ view] frame];

[window setFrame:[window frameRectForContentRect:viewFrame]

display:NO];