chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc - Issue 23815006: [Cleanup] rename WebContentsModalDialogManager::IsShowingDialog() to IsDialogActive()

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/views/tab_contents/chrome_web_contents_view_delegate_views.cc

Issue 23815006: [Cleanup] rename WebContentsModalDialogManager::IsShowingDialog() to IsDialogActive() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 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/views/constrained_window_views_browsertest.cc ('k') | chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc

diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc

index 8abb284ea5f2fea4390b6aec254783721c5abf78..04dc7b8f7ce2712abd7e94d21f39cadc219919ab 100644

--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc

+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc

@@ -77,7 +77,7 @@ bool ChromeWebContentsViewDelegateViews::Focus() {

// TODO(erg): WebContents used to own web contents modal dialogs, which is

// why this is here. Eventually this should be ported to a containing view

// specializing in web contents modal dialog management.

- if (web_contents_modal_dialog_manager->IsShowingDialog()) {

+ if (web_contents_modal_dialog_manager->IsDialogActive()) {

web_contents_modal_dialog_manager->FocusTopmostDialog();

return true;

}