chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm - Issue 985133002: Remove NativeWebContentsModalDialog and NativePopup typedefs.

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

Issue 985133002: Remove NativeWebContentsModalDialog and NativePopup typedefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extension-popup

Patch Set: Created 5 years, 9 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/single_web_contents_dialog_manager_cocoa.h ('k') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

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

index 3bd76bd21a2b567432781f0393256b3ecbeb2391..e03e70f5ca68f91d0abdd80f865ac704b47f277a 100644

--- a/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

+++ b/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

@@ -10,7 +10,6 @@

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

#include "components/web_modal/web_contents_modal_dialog_manager.h"

-using web_modal::NativeWebContentsModalDialog;

using web_modal::SingleWebContentsDialogManagerDelegate;

SingleWebContentsDialogManagerCocoa::SingleWebContentsDialogManagerCocoa(

@@ -69,7 +68,7 @@ void SingleWebContentsDialogManagerCocoa::HostChanged(

web_modal::WebContentsModalDialogHost* new_host) {

}

-NativeWebContentsModalDialog SingleWebContentsDialogManagerCocoa::dialog() {

+gfx::NativeWindow SingleWebContentsDialogManagerCocoa::dialog() {

return [sheet_ sheetWindow];

}

@@ -77,7 +76,7 @@ namespace web_modal {

SingleWebContentsDialogManager*

WebContentsModalDialogManager::CreateNativeWebModalManager(

- NativeWebContentsModalDialog dialog,

+ gfx::NativeWindow dialog,

SingleWebContentsDialogManagerDelegate* delegate) {

base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(

[[CustomConstrainedWindowSheet alloc] initWithCustomWindow:dialog]);