chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm - Issue 2087643003: Move web modal dialog manager files into the constrained_window component.

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

Issue 2087643003: Move web modal dialog manager files into the constrained_window component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert changes to gyp files, IWYU for #ifdef (OS_MACOSX). Created 4 years, 4 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/chromeos/login/ui/captive_portal_window_proxy.cc ('k') | chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 54f722fa391ef2952c66641fc955c66f028392e7..510b5d9a95fd81448d5c6afc414d90d8620ee730 100644

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

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

@@ -16,7 +16,7 @@

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/test/base/in_process_browser_test.h"

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

+#include "components/constrained_window/constrained_window_views.h"

#include "ui/views/widget/widget.h"

#include "ui/views/widget/widget_observer.h"

#include "ui/views/window/dialog_delegate.h"

@@ -39,18 +39,10 @@ class WebContentsModalDialogManagerViewsMacTest : public InProcessBrowserTest,

DCHECK(web_contents);

- // Toolkit-views dialogs would use constrained_window::

- // ShowWebModalDialogViews(new TestDialog, web_contents), but the

- // constrained_window component is not used in Cocoa code (disallowed via

- // DEPS). It does basically the following anyway.

- Widget* widget = views::DialogDelegate::CreateDialogWidget(

- new TestDialog,

- nullptr, [browser()->window()->GetNativeWindow() contentView]);

+ // Show a dialog as a constrained window modal to the current tab.

+ Widget* widget = constrained_window::ShowWebModalDialogViews(new TestDialog,

+ web_contents);

widget->AddObserver(this);

- web_modal::WebContentsModalDialogManager* manager =

- web_modal::WebContentsModalDialogManager::FromWebContents(web_contents);

- manager->ShowModalDialog(widget->GetNativeWindow());

return widget;

}