Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

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

Issue 63343004: Remove DialogDelegate::UseNewStyle and unused code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Additional cleanup; sync and rebase. Created 7 years, 1 month 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
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 a430357e1da993ab64a2e1ef7bdb76dd31f78782..b4c77e4631ce9d49a86d39bd25b7032c9cb31ad1 100644
--- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc
+++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -22,7 +22,6 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
#include "ipc/ipc_message.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/views/controls/textfield/textfield.h"
@@ -158,7 +157,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, MAYBE_FocusTest) {
scoped_ptr<TestConstrainedDialog> test_dialog1(new TestConstrainedDialog);
views::Widget* window1 = views::Widget::CreateWindowAsFramelessChild(
test_dialog1.get(),
- web_contents->GetView()->GetNativeView(),
modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
web_contents_modal_dialog_manager->ShowDialog(window1->GetNativeView());
@@ -175,7 +173,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, MAYBE_FocusTest) {
scoped_ptr<TestConstrainedDialog> test_dialog2(new TestConstrainedDialog);
views::Widget* window2 = views::Widget::CreateWindowAsFramelessChild(
test_dialog2.get(),
- web_contents->GetView()->GetNativeView(),
modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
web_contents_modal_dialog_manager->ShowDialog(window2->GetNativeView());
// Should be the same focus_manager.
@@ -249,7 +246,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, MAYBE_TabCloseTest) {
scoped_ptr<TestConstrainedDialog> test_dialog(new TestConstrainedDialog);
views::Widget* window = views::Widget::CreateWindowAsFramelessChild(
test_dialog.get(),
- web_contents->GetView()->GetNativeView(),
modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
web_contents_modal_dialog_manager->ShowDialog(window->GetNativeView());
@@ -285,7 +281,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, MAYBE_TabSwitchTest) {
ASSERT_TRUE(modal_delegate != NULL);
views::Widget* window = views::Widget::CreateWindowAsFramelessChild(
test_dialog.get(),
- web_contents->GetView()->GetNativeView(),
modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
web_contents_modal_dialog_manager->ShowDialog(window->GetNativeView());
EXPECT_TRUE(window->IsVisible());
@@ -336,7 +331,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, TabMoveTest) {
ASSERT_TRUE(modal_delegate != NULL);
views::Widget* window = views::Widget::CreateWindowAsFramelessChild(
test_dialog.get(),
- web_contents->GetView()->GetNativeView(),
modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
web_contents_modal_dialog_manager->ShowDialog(window->GetNativeView());
EXPECT_TRUE(window->IsVisible());

Powered by Google App Engine
This is Rietveld 408576698