Get rid of the set_delete_on_destroy setter now that we have CreateParams.

BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6883104

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82486 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 54 insertions, 51 deletions

diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 11662df..82afc17 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -1603,39 +1603,40 @@ TEST_F(FocusManagerTest, CreationForNativeRoot) {
   ASSERT_TRUE(hwnd);
 
   // Create a view window parented to native dialog.
-  WidgetWin window1;
-  window1.set_delete_on_destroy(false);
-  window1.set_window_style(WS_CHILD);
-  window1.Init(hwnd, gfx::Rect(0, 0, 100, 100));
+  WidgetWin widget1;
+  Widget::CreateParams params(Widget::CreateParams::TYPE_CONTROL);
+  params.delete_on_destroy = false;
+  widget1.SetCreateParams(params);
+  widget1.set_window_style(WS_CHILD);
+  widget1.Init(hwnd, gfx::Rect(0, 0, 100, 100));
 
   // Get the focus manager directly from the first window.  Should exist
   // because the first window is the root widget.
-  views::FocusManager* focus_manager_member1 = window1.GetFocusManager();
+  views::FocusManager* focus_manager_member1 = widget1.GetFocusManager();
   EXPECT_TRUE(focus_manager_member1);
 
   // Create another view window parented to the first view window.
-  WidgetWin window2;
-  window2.set_delete_on_destroy(false);
-  window2.set_window_style(WS_CHILD);
-  window2.Init(window1.GetNativeView(), gfx::Rect(0, 0, 100, 100));
+  WidgetWin widget2;
+  widget2.SetCreateParams(params);
+  widget2.Init(widget1.GetNativeView(), gfx::Rect(0, 0, 100, 100));
 
   // Get the focus manager directly from the second window. Should return the
   // first window's focus manager.
-  views::FocusManager* focus_manager_member2 = window2.GetFocusManager();
+  views::FocusManager* focus_manager_member2 = widget2.GetFocusManager();
   EXPECT_EQ(focus_manager_member2, focus_manager_member1);
 
   // Get the focus manager indirectly using the first window handle. Should
   // return the first window's focus manager.
   views::FocusManager* focus_manager_indirect =
       views::FocusManager::GetFocusManagerForNativeView(
-          window1.GetNativeView());
+          widget1.GetNativeView());
   EXPECT_EQ(focus_manager_indirect, focus_manager_member1);
 
   // Get the focus manager indirectly using the second window handle. Should
   // return the first window's focus manager.
   focus_manager_indirect =
       views::FocusManager::GetFocusManagerForNativeView(
-          window2.GetNativeView());
+          widget2.GetNativeView());
   EXPECT_EQ(focus_manager_indirect, focus_manager_member1);
 
   DestroyWindow(hwnd);
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index aa5d939..ce37be9 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -366,14 +366,12 @@ TEST_F(ViewTest, MouseEvent) {
   TestView* v2 = new TestView();
   v2->SetBounds(100, 100, 100, 100);
 
-  scoped_ptr<Widget> window(CreateWidget());
-#if defined(OS_WIN)
-  WidgetWin* window_win = static_cast<WidgetWin*>(window.get());
-  window_win->set_delete_on_destroy(false);
-  window_win->set_window_style(WS_OVERLAPPEDWINDOW);
-  window_win->Init(NULL, gfx::Rect(50, 50, 650, 650));
-#endif
-  RootView* root = window->GetRootView();
+  scoped_ptr<Widget> widget(CreateWidget());
+  Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
+  params.delete_on_destroy = false;
+  widget->SetCreateParams(params);
+  widget->Init(NULL, gfx::Rect(50, 50, 650, 650));
+  RootView* root = widget->GetRootView();
 
   root->AddChildView(v1);
   v1->AddChildView(v2);
@@ -417,7 +415,7 @@ TEST_F(ViewTest, MouseEvent) {
   // Make sure v1 did not receive the event
   EXPECT_EQ(v1->last_mouse_event_type_, 0);
 
-  window->CloseNow();
+  widget->CloseNow();
 }
 
 #if defined(TOUCH_UI)
@@ -1003,16 +1001,17 @@ TEST_F(ViewTest, ActivateAccelerator) {
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
 
   // Create a window and add the view as its child.
-  WidgetWin window;
-  window.Init(NULL, gfx::Rect(0, 0, 100, 100));
-  window.set_delete_on_destroy(false);
-  window.set_window_style(WS_OVERLAPPEDWINDOW);
-  RootView* root = window.GetRootView();
+  WidgetWin widget;
+  Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
+  params.delete_on_destroy = false;
+  widget.SetCreateParams(params);
+  widget.Init(NULL, gfx::Rect(0, 0, 100, 100));
+  RootView* root = widget.GetRootView();
   root->AddChildView(view);
 
   // Get the focus manager.
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManagerForNativeView(window.GetNativeView());
+      views::FocusManager::GetFocusManagerForNativeView(widget.GetNativeView());
   ASSERT_TRUE(focus_manager);
 
   // Hit the return key and see if it takes effect.
@@ -1055,7 +1054,7 @@ TEST_F(ViewTest, ActivateAccelerator) {
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 2);
   EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 2);
 
-  window.CloseNow();
+  widget.CloseNow();
 }
 #endif
 
@@ -1067,15 +1066,16 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) {
   view->AddAccelerator(return_accelerator);
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
 
-  WidgetWin window;
-  window.Init(NULL, gfx::Rect(0, 0, 100, 100));
-  window.set_delete_on_destroy(false);
-  window.set_window_style(WS_OVERLAPPEDWINDOW);
-  RootView* root = window.GetRootView();
+  WidgetWin widget;
+  Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
+  params.delete_on_destroy = false;
+  widget.SetCreateParams(params);
+  widget.Init(NULL, gfx::Rect(0, 0, 100, 100));
+  RootView* root = widget.GetRootView();
   root->AddChildView(view);
 
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManagerForNativeView(window.GetNativeView());
+      views::FocusManager::GetFocusManagerForNativeView(widget.GetNativeView());
   ASSERT_TRUE(focus_manager);
 
   view->SetVisible(false);
@@ -1086,7 +1086,7 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) {
   EXPECT_EQ(view,
             focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
 
-  window.CloseNow();
+  widget.CloseNow();
 }
 #endif
 
@@ -1876,10 +1876,10 @@ TEST_F(ViewTest, OnVisibleBoundsChanged) {
   gfx::Rect viewport_bounds(0, 0, 100, 100);
 
   scoped_ptr<Widget> widget(CreateWidget());
-  WidgetWin* widget_win = static_cast<WidgetWin*>(widget.get());
-  widget_win->set_delete_on_destroy(false);
-  widget_win->set_window_style(WS_OVERLAPPEDWINDOW);
-  widget_win->Init(NULL, viewport_bounds);
+  Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
+  params.delete_on_destroy = false;
+  widget->SetCreateParams(params);
+  widget->Init(NULL, viewport_bounds);
   widget->GetRootView()->SetBoundsRect(viewport_bounds);
 
   View* viewport = new View;
diff --git a/views/widget/native_widget_test_utils_win.cc b/views/widget/native_widget_test_utils_win.cc
index 2d016e9..85a5fe9 100644
--- a/views/widget/native_widget_test_utils_win.cc
+++ b/views/widget/native_widget_test_utils_win.cc
@@ -16,14 +16,19 @@ NativeWidget* CreateNativeWidget() {
 
 NativeWidget* CreateNativeWidgetWithContents(View* contents_view) {
   WidgetWin* widget = new WidgetWin;
-  widget->set_delete_on_destroy(false);
+  Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
+  params.delete_on_destroy = false;
+  widget->SetCreateParams(params);
   widget->Init(NULL, gfx::Rect(10, 10, 200, 200));
   return widget;
 }
 
 NativeWidget* CreateNativeWidgetWithParent(NativeWidget* parent) {
   WidgetWin* widget = new WidgetWin;
-  widget->set_delete_on_destroy(false);
+  Widget::CreateParams params(Widget::CreateParams::TYPE_CONTROL);
+  params.delete_on_destroy = false;
+  params.child = false; // Implicitly set to true by ctor with TYPE_CONTROL.
+  widget->SetCreateParams(params);
   widget->Init(parent ? parent->GetWidget()->GetNativeView() : NULL,
                gfx::Rect(10, 10, 200, 200));
   return widget;
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 15d7dc0..bc6cf23c 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -238,7 +238,7 @@ void WidgetWin::SetCreateParams(const CreateParams& params) {
   DCHECK(!GetNativeView());
 
   // Set non-style attributes.
-  set_delete_on_destroy(params.delete_on_destroy);
+  delete_on_destroy_ = params.delete_on_destroy;
 
   DWORD style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
   DWORD ex_style = 0;
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index bd5e391..6e795de 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -92,10 +92,6 @@ class WidgetWin : public ui::WindowImpl,
   // enabled.
   static bool IsAeroGlassEnabled();
 
-  void set_delete_on_destroy(bool delete_on_destroy) {
-    delete_on_destroy_ = delete_on_destroy;
-  }
-
   // Disable Layered Window updates by setting to false.
   void set_can_update_layered_window(bool can_update_layered_window) {
     can_update_layered_window_ = can_update_layered_window;
diff --git a/views/widget/widget_win_unittest.cc b/views/widget/widget_win_unittest.cc
index 94b3fd1..ecf89cb 100644
--- a/views/widget/widget_win_unittest.cc
+++ b/views/widget/widget_win_unittest.cc
@@ -43,11 +43,12 @@ class WidgetWinTest : public testing::Test {
 
 
 WidgetWin* WidgetWinTest::CreateWidgetWin() {
-  scoped_ptr<WidgetWin> window(new WidgetWin());
-  window->set_delete_on_destroy(false);
-  window->set_window_style(WS_OVERLAPPEDWINDOW);
-  window->Init(NULL, gfx::Rect(50, 50, 650, 650));
-  return window.release();
+  scoped_ptr<WidgetWin> widget(new WidgetWin());
+  Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
+  params.delete_on_destroy = false;
+  widget->SetCreateParams(params);
+  widget->Init(NULL, gfx::Rect(50, 50, 650, 650));
+  return widget.release();
 }
 
 TEST_F(WidgetWinTest, ZoomWindow) {