Refactor modality-specific behavior from ConstrainedWindowViews to WebContentsModalDialogManager

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/profiles/profile.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"
@@ skipping 118 matching lines @@
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents != NULL);
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   ASSERT_TRUE(web_contents_modal_dialog_manager != NULL);
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog1(new TestConstrainedDialog);
-  ConstrainedWindowViews* window1 = new ConstrainedWindowViews(
+  ConstrainedWindowViews* window1 = ConstrainedWindowViews::Create(
       web_contents, test_dialog1.get());
 
   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);
-  ConstrainedWindowViews* window2 = new ConstrainedWindowViews(
+  ConstrainedWindowViews* window2 = ConstrainedWindowViews::Create(
       web_contents, test_dialog2.get());
   // 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->IsShowingDialog());
 
   // Now send a VKEY_RETURN to the browser.  This should result in closing
@@ skipping 40 matching lines @@
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, TabCloseTest) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents != NULL);
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   ASSERT_TRUE(web_contents_modal_dialog_manager != NULL);
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog(new TestConstrainedDialog);
-  new ConstrainedWindowViews(
+  ConstrainedWindowViews::Create(
       web_contents, test_dialog.get());
 
   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());
 }
 
 // Tests that the constrained window is hidden when an other tab is selected and
 // shown when its tab is selected again.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, TabSwitchTest) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents != NULL);
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog(new TestConstrainedDialog);
-  ConstrainedWindowViews* window = new ConstrainedWindowViews(
+  ConstrainedWindowViews* window = ConstrainedWindowViews::Create(
       web_contents, test_dialog.get());
   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 101 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))