components/web_modal/web_contents_modal_dialog_manager.cc - Issue 231173004: [WebModal] Rename NativeWebContentsModalDialogManager to SingleWebContentsDialogManager.

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: components/web_modal/web_contents_modal_dialog_manager.cc

Issue 231173004: [WebModal] Rename NativeWebContentsModalDialogManager to SingleWebContentsDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: constrained window test Created 6 years, 8 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 | « components/web_modal/web_contents_modal_dialog_manager.h ('k') | components/web_modal/web_contents_modal_dialog_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_modal/web_contents_modal_dialog_manager.cc

diff --git a/components/web_modal/web_contents_modal_dialog_manager.cc b/components/web_modal/web_contents_modal_dialog_manager.cc

index dfd7bad4cfe094c3ce2077bf5b724ab0a7354e26..99fd4e41c5983e0050ffd8f265fe3e2f613baa7d 100644

--- a/components/web_modal/web_contents_modal_dialog_manager.cc

+++ b/components/web_modal/web_contents_modal_dialog_manager.cc

@@ -33,18 +33,17 @@ void WebContentsModalDialogManager::SetDelegate(

}

-// TODO(gbillock): Rename to ShowWebModalDialog()

-void WebContentsModalDialogManager::ShowDialog(

+void WebContentsModalDialogManager::ShowModalDialog(

NativeWebContentsModalDialog dialog) {

- scoped_ptr<NativeWebContentsModalDialogManager> mgr(

- CreateNativeManager(this));

+ scoped_ptr<SingleWebContentsDialogManager> mgr(

+ CreateNativeWebModalManager(this));

ShowDialogWithManager(dialog, mgr.Pass());

}

// TODO(gbillock): Maybe "ShowBubbleWithManager"?

void WebContentsModalDialogManager::ShowDialogWithManager(

NativeWebContentsModalDialog dialog,

- scoped_ptr<NativeWebContentsModalDialogManager> manager) {

+ scoped_ptr<SingleWebContentsDialogManager> manager) {

if (delegate_)

manager->HostChanged(delegate_->GetWebContentsModalDialogHost());

child_dialogs_.push_back(new DialogState(dialog, manager.Pass()));

@@ -108,7 +107,7 @@ WebContentsModalDialogManager::WebContentsModalDialogManager(

WebContentsModalDialogManager::DialogState::DialogState(

NativeWebContentsModalDialog dialog,

- scoped_ptr<NativeWebContentsModalDialogManager> mgr)

+ scoped_ptr<SingleWebContentsDialogManager> mgr)

: dialog(dialog),

manager(mgr.release()),

#if defined(USE_AURA)