Make Widget ownership a little clearer by expressing it in terms of an enum.

views/view_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/clipboard/clipboard.h"
@@ skipping 277 matching lines @@
 
 TEST_F(ViewTest, MouseEvent) {
   TestView* v1 = new TestView();
   v1->SetBounds(0, 0, 300, 300);
 
   TestView* v2 = new TestView();
   v2->SetBounds(100, 100, 100, 100);
 
   scoped_ptr<Widget> widget(new Widget);
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-  params.delete_on_destroy = false;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();
 
   root->AddChildView(v1);
   v1->AddChildView(v2);
 
   v1->Reset();
   v2->Reset();
 
@@ skipping 88 matching lines @@
   v1->SetBounds(0, 0, 300, 300);
 
   TestView* v2 = new TestView();
   v2->SetBounds(100, 100, 100, 100);
 
   TestView* v3 = new TestViewIgnoreTouch();
   v3->SetBounds(0, 0, 100, 100);
 
   scoped_ptr<Widget> widget(new Widget());
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-  params.delete_on_destroy = false;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();
 
   root->AddChildView(v1);
   static_cast<internal::RootView*>(root)->SetGestureManager(gm);
   v1->AddChildView(v2);
   v2->AddChildView(v3);
 
   // |v3| completely obscures |v2|, but all the touch events on |v3| should
@@ skipping 510 matching lines @@
   // Register a keyboard accelerator before the view is added to a window.
   Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
 
   // Create a window and add the view as its child.
   scoped_ptr<Widget> widget(new Widget);
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-  params.delete_on_destroy = false;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(0, 0, 100, 100);
   widget->Init(params);
   View* root = widget->GetRootView();
   root->AddChildView(view);
 
   // Get the focus manager.
   FocusManager* focus_manager = FocusManager::GetFocusManagerForNativeView(
       widget->GetNativeView());
   ASSERT_TRUE(focus_manager);
 
@@ skipping 44 matching lines @@
 #if defined(OS_WIN)
 TEST_F(ViewTest, HiddenViewWithAccelerator) {
   Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
 
   scoped_ptr<Widget> widget(new Widget);
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-  params.delete_on_destroy = false;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(0, 0, 100, 100);
   widget->Init(params);
   View* root = widget->GetRootView();
   root->AddChildView(view);
 
   FocusManager* focus_manager = FocusManager::GetFocusManagerForNativeView(
       widget->GetNativeView());
   ASSERT_TRUE(focus_manager);
 
   view->SetVisible(false);
@@ skipping 801 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(VisibleBoundsView);
 };
 
 #if defined(OS_WIN)
 // TODO(beng): This can be cross platform when widget construction/init is.
 TEST_F(ViewTest, OnVisibleBoundsChanged) {
   gfx::Rect viewport_bounds(0, 0, 100, 100);
 
   scoped_ptr<Widget> widget(new Widget);
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-  params.delete_on_destroy = false;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = viewport_bounds;
   widget->Init(params);
   widget->GetRootView()->SetBoundsRect(viewport_bounds);
 
   View* viewport = new View;
   widget->SetContentsView(viewport);
   View* contents = new View;
   viewport->AddChildView(contents);
   viewport->SetBoundsRect(viewport_bounds);
   contents->SetBounds(0, 0, 100, 200);
@@ skipping 170 matching lines @@
   EXPECT_TRUE(v2->Contains(v2));
   EXPECT_FALSE(v2->Contains(&v1));
   EXPECT_TRUE(v2->Contains(v3));
   EXPECT_FALSE(v3->Contains(NULL));
   EXPECT_TRUE(v3->Contains(v3));
   EXPECT_FALSE(v3->Contains(&v1));
   EXPECT_FALSE(v3->Contains(v2));
 }
 
 }  // namespace views