Remove DialogDelegate::UseNewStyle and unused code.

chrome/browser/ui/views/constrained_window_views_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.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"
 #include "content/public/browser/native_web_keyboard_event.h"
 #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"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/web_dialogs/test/test_web_dialog_delegate.h"
 
 #if defined(USE_AURA) && defined(USE_X11)
@@ skipping 115 matching lines @@
       WebContentsModalDialogManager::FromWebContents(web_contents);
   ASSERT_TRUE(web_contents_modal_dialog_manager != NULL);
   WebContentsModalDialogManagerDelegate* modal_delegate =
       web_contents_modal_dialog_manager->delegate();
   ASSERT_TRUE(modal_delegate != NULL);
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   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());
 
   views::FocusManager* focus_manager = window1->GetFocusManager();
   ASSERT_TRUE(focus_manager);
 
   // test_dialog1's text field should be focused.
   EXPECT_EQ(test_dialog1->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
 
   // Now create a second constrained dialog.  This will also be attached to
   // web_contents, but will remain hidden since the test_dialog1 is still
   // showing.
   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.
   ASSERT_EQ(focus_manager, window2->GetFocusManager());
 
   // test_dialog1's text field should still be the view that has focus.
   EXPECT_EQ(test_dialog1->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
   ASSERT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());
 
@@ skipping 53 matching lines @@
       WebContentsModalDialogManager::FromWebContents(web_contents);
   ASSERT_TRUE(web_contents_modal_dialog_manager != NULL);
   WebContentsModalDialogManagerDelegate* modal_delegate =
       web_contents_modal_dialog_manager->delegate();
   ASSERT_TRUE(modal_delegate != NULL);
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   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());
 
   bool closed =
       browser()->tab_strip_model()->CloseWebContentsAt(
           browser()->tab_strip_model()->active_index(),
           TabStripModel::CLOSE_NONE);
   EXPECT_TRUE(closed);
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(test_dialog->done());
@@ skipping 15 matching lines @@
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog(new TestConstrainedDialog);
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   WebContentsModalDialogManagerDelegate* modal_delegate =
       web_contents_modal_dialog_manager->delegate();
   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());
 
   // Open a new tab. The constrained window should hide itself.
   browser()->tab_strip_model()->AppendWebContents(
       content::WebContents::Create(
           content::WebContents::CreateParams(browser()->profile())),
       true);
   EXPECT_FALSE(window->IsVisible());
@@ skipping 30 matching lines @@
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog(new TestConstrainedDialog);
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   WebContentsModalDialogManagerDelegate* modal_delegate =
       web_contents_modal_dialog_manager->delegate();
   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());
 
   // Detach the web contents from the second browser's tab strip.
   browser2->tab_strip_model()->DetachWebContentsAt(
       browser2->tab_strip_model()->GetIndexOfWebContents(web_contents));
 
   // Append the web contents to the first browser.
   browser()->tab_strip_model()->AppendWebContents(web_contents, true);
@@ skipping 119 matching lines @@
   // Escape is not processed as accelerator before it's sent to web contents.
   EXPECT_FALSE(observer.widget_closed());
 
   content::RunAllPendingInMessageLoop();
 
   // Escape is processed as accelerator after it's sent to web contents.
   EXPECT_TRUE(observer.widget_closed());
 }
 
 #endif  // defined(OS_WIN) || (defined(USE_AURA) && defined(USE_X11))