chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc - 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/views/extensions/media_galleries_dialog_views.cc

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/views/desktop_media_picker_views.cc ('k') | chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

index 4ab4050dac871515ba44e61566b01b77d0e8ecff..b51d7397815767128d3c7d283bb8cb92b3ffc1f7 100644

--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

@@ -9,7 +9,7 @@

#include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"

#include "chrome/grit/generated_resources.h"

#include "chrome/grit/locale_settings.h"

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

+#include "components/web_modal/web_contents_modal_dialog_manager.h"

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

#include "ui/base/l10n/l10n_util.h"

#include "ui/native_theme/native_theme.h"

@@ -79,10 +79,12 @@ MediaGalleriesDialogViews::~MediaGalleriesDialogViews() {

void MediaGalleriesDialogViews::AcceptDialogForTesting() {

accepted_ = true;

- web_modal::PopupManager* popup_manager =

- web_modal::PopupManager::FromWebContents(controller_->WebContents());

- DCHECK(popup_manager);

- popup_manager->CloseAllDialogsForTesting(controller_->WebContents());

+ web_modal::WebContentsModalDialogManager* web_contents_modal_dialog_manager =

+ web_modal::WebContentsModalDialogManager::FromWebContents(

+ controller_->WebContents());

+ DCHECK(web_contents_modal_dialog_manager);

+ web_modal::WebContentsModalDialogManager::TestApi(

+ web_contents_modal_dialog_manager).CloseAllDialogs();

}

void MediaGalleriesDialogViews::InitChildViews() {