chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm - Issue 586933002: Re-Revert "[WebModals] New API for browser-scoped popup management."

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/constrained_window/constrained_window_mac.mm

Issue 586933002: Re-Revert "[WebModals] New API for browser-scoped popup management." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2125

Patch Set: Created 6 years, 3 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/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

index ab7989be521f0d75f5fbf49dcfee2cac4110397c..84f9d462f6eea834d82198ee14d5d7bb4535e48d 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

@@ -11,7 +11,6 @@

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h"

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"

#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

-#include "components/web_modal/popup_manager.h"

#include "components/web_modal/web_contents_modal_dialog_manager.h"

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

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

@@ -35,10 +34,9 @@ ConstrainedWindowMac::ConstrainedWindowMac(

web_contents_ = web_view_guest && web_view_guest->embedder_web_contents() ?

web_view_guest->embedder_web_contents() : web_contents;

DCHECK(sheet_.get());

- web_modal::PopupManager* popup_manager =

- web_modal::PopupManager::FromWebContents(web_contents_);

- if (popup_manager)

- popup_manager->ShowModalDialog(this, web_contents_);

+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ WebContentsModalDialogManager::FromWebContents(web_contents_);

+ web_contents_modal_dialog_manager->ShowModalDialog(this);

}

ConstrainedWindowMac::~ConstrainedWindowMac() {