chrome/browser/ui/web_contents_modal_dialog_manager.cc - Issue 12045037: Refactor modality-specific behavior from ConstrainedWindowViews to WebContentsModalDialogManager

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

Issue 12045037: Refactor modality-specific behavior from ConstrainedWindowViews to WebContentsModalDialogManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Android link error Created 7 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/web_contents_modal_dialog_manager.h ('k') | chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/web_contents_modal_dialog_manager.cc

diff --git a/chrome/browser/ui/web_contents_modal_dialog_manager.cc b/chrome/browser/ui/web_contents_modal_dialog_manager.cc

index 35ac0644efd2d1ed0a2c7c6dd7cbc353663ed2ef..819580e7bce499ebd2efb08300e100db2c56e197 100644

--- a/chrome/browser/ui/web_contents_modal_dialog_manager.cc

+++ b/chrome/browser/ui/web_contents_modal_dialog_manager.cc

@@ -25,6 +25,9 @@ void WebContentsModalDialogManager::AddDialog(

WebContentsModalDialog* dialog) {

child_dialogs_.push_back(dialog);

+ if (native_manager_)

+ native_manager_->ManageDialog(dialog->GetNativeWindow());

if (child_dialogs_.size() == 1) {

dialog->ShowWebContentsModalDialog();

BlockWebContentsInteraction(true);

@@ -78,7 +81,9 @@ void WebContentsModalDialogManager::FocusTopmostDialog() {

WebContentsModalDialogManager::WebContentsModalDialogManager(

content::WebContents* web_contents)

: content::WebContentsObserver(web_contents),

- delegate_(NULL) {

+ delegate_(NULL),

+ native_manager_(

+ ALLOW_THIS_IN_INITIALIZER_LIST(CreateNativeManager(this))) {

}

void WebContentsModalDialogManager::CloseAllDialogs() {