chrome/browser/ui/cocoa/profiles/user_manager_mac.mm - Issue 1446623003: [Reland] Enable AutoResize for Constrained Web Dialogs for Mac.

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/profiles/user_manager_mac.mm

Issue 1446623003: [Reland] Enable AutoResize for Constrained Web Dialogs for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 years, 10 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/profiles/user_manager_mac.h ('k') | chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/user_manager_mac.mm

diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm

index 48a02249c65b03c656aa468c7e2a0f2419ba30f9..cdae2820c1fff4728579324166488a4274537dbe 100644

--- a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm

+++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm

@@ -167,7 +167,7 @@ class ReauthDialogDelegate : public UserManager::ReauthDialogObserver,

std::string emailAddress_;

content::WebContents* webContents_;

scoped_ptr<ReauthDialogDelegate> webContentsDelegate_;

- scoped_ptr<ConstrainedWindowMac> constrained_window_;

+ std::unique_ptr<ConstrainedWindowMac> constrained_window_;

scoped_ptr<content::WebContents> reauthWebContents_;

}

- (id)initWithProfile:(Profile*)profile

@@ -203,9 +203,9 @@ class ReauthDialogDelegate : public UserManager::ReauthDialogObserver,

base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(

[[CustomConstrainedWindowSheet alloc]

initWithCustomWindow:[self window]]);

- constrained_window_.reset(

- new ConstrainedWindowMac(

- webContentsDelegate_.get(), webContents_, sheet));

+ constrained_window_ =

+ CreateAndShowWebModalDialogMac(

+ webContentsDelegate_.get(), webContents_, sheet);

// The close button needs to call CloseWebContentsModalDialog() on the

// constrained window isntead of just [window close] so grab a reference to