chrome/browser/ui/views/constrained_window_views_browsertest.cc - Issue 231173004: [WebModal] Rename NativeWebContentsModalDialogManager to SingleWebContentsDialogManager.

Unified Diff: chrome/browser/ui/views/constrained_window_views_browsertest.cc

Issue 231173004: [WebModal] Rename NativeWebContentsModalDialogManager to SingleWebContentsDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: constrained window test Created 6 years, 8 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_web_dialog_delegate_views.cc ('k') | chrome/browser/ui/views/download/download_danger_prompt_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/constrained_window_views_browsertest.cc

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

index afc26a421c76f1e69be0f7af5bd3d5b1221f17d0..3f19cb00b83615fc92f66c59df99b7db819e20e5 100644

--- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc

+++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc

@@ -158,7 +158,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, MAYBE_FocusTest) {

views::Widget* window1 = views::Widget::CreateWindowAsFramelessChild(

test_dialog1.get(),

modal_delegate->GetWebContentsModalDialogHost()->GetHostView());

- web_contents_modal_dialog_manager->ShowDialog(window1->GetNativeView());

+ web_contents_modal_dialog_manager->ShowModalDialog(window1->GetNativeView());

views::FocusManager* focus_manager = window1->GetFocusManager();

ASSERT_TRUE(focus_manager);

@@ -174,7 +174,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, MAYBE_FocusTest) {

views::Widget* window2 = views::Widget::CreateWindowAsFramelessChild(

test_dialog2.get(),

modal_delegate->GetWebContentsModalDialogHost()->GetHostView());

- web_contents_modal_dialog_manager->ShowDialog(window2->GetNativeView());

+ web_contents_modal_dialog_manager->ShowModalDialog(window2->GetNativeView());

// Should be the same focus_manager.

ASSERT_EQ(focus_manager, window2->GetFocusManager());

@@ -247,7 +247,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, MAYBE_TabCloseTest) {

views::Widget* window = views::Widget::CreateWindowAsFramelessChild(

test_dialog.get(),

modal_delegate->GetWebContentsModalDialogHost()->GetHostView());

- web_contents_modal_dialog_manager->ShowDialog(window->GetNativeView());

+ web_contents_modal_dialog_manager->ShowModalDialog(window->GetNativeView());

bool closed =

browser()->tab_strip_model()->CloseWebContentsAt(

@@ -282,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, MAYBE_TabSwitchTest) {

views::Widget* window = views::Widget::CreateWindowAsFramelessChild(

test_dialog.get(),

modal_delegate->GetWebContentsModalDialogHost()->GetHostView());

- web_contents_modal_dialog_manager->ShowDialog(window->GetNativeView());

+ web_contents_modal_dialog_manager->ShowModalDialog(window->GetNativeView());

EXPECT_TRUE(window->IsVisible());

// Open a new tab. The constrained window should hide itself.

@@ -332,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, TabMoveTest) {

views::Widget* window = views::Widget::CreateWindowAsFramelessChild(

test_dialog.get(),

modal_delegate->GetWebContentsModalDialogHost()->GetHostView());

- web_contents_modal_dialog_manager->ShowDialog(window->GetNativeView());

+ web_contents_modal_dialog_manager->ShowModalDialog(window->GetNativeView());

EXPECT_TRUE(window->IsVisible());

// Detach the web contents from the second browser's tab strip.