chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc - 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/chromeos/login/ui/captive_portal_window_proxy.cc

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: Rebase? Created 4 years, 6 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 | « no previous file | chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm » ('j') | chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc

diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc b/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc

index 9acc39021941f8b9f5a1887e4f015941050f257b..16b3ea2a7b9a1adb640babdd4154d0401295fcfa 100644

--- a/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc

+++ b/chrome/browser/chromeos/login/ui/captive_portal_window_proxy.cc

@@ -8,6 +8,7 @@

#include "chrome/browser/chromeos/login/ui/captive_portal_view.h"

#include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

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

#include "components/web_modal/web_contents_modal_dialog_host.h"

#include "components/web_modal/web_contents_modal_dialog_manager.h"

#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"

@@ -81,7 +82,7 @@ void CaptivePortalWindowProxy::Show() {

manager->delegate()->GetWebContentsModalDialogHost()->GetHostView());

portal->Init();

widget_->AddObserver(this);

- manager->ShowModalDialog(widget_->GetNativeView());

+ constrained_window::ShowModalDialog(widget_->GetNativeView(), web_contents_);

}

void CaptivePortalWindowProxy::Close() {