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

views/widget/widget.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 38 matching lines @@
 //
 //  Encapsulates the platform-specific rendering, event receiving and widget
 //  management aspects of the UI framework.
 //
 //  Owns a RootView and thus a View hierarchy. Can contain child Widgets.
 //  Widget is a platform-independent type that communicates with a platform or
 //  context specific NativeWidget implementation.
 //
 //  A special note on ownership:
 //
-//    Depending on the value of "delete_on_destroy", the Widget either owns or
-//    is owned by its NativeWidget:
+//    Depending on the value of the InitParams' ownership field, the Widget
+//    either owns or is owned by its NativeWidget:
 //
-//    delete_on_destroy = true (default)
+//    ownership = NATIVE_WIDGET_OWNS_WIDGET (default)
 //      The Widget instance is owned by its NativeWidget. When the NativeWidget
 //      is destroyed (in response to a native destruction message), it deletes
 //      the Widget from its destructor.
-//    delete_on_destroy = false (non-default)
+//    ownership = WIDGET_OWNS_NATIVE_WIDGET (non-default)
 //      The Widget instance owns its NativeWidget. This state implies someone
 //      else wants to control the lifetime of this object. When they destroy
 //      the Widget it is responsible for destroying the NativeWidget (from its
 //      destructor).
 //
 class Widget : public internal::NativeWidgetDelegate,
                public FocusTraversable {
  public:
   struct InitParams {
     enum Type {
       TYPE_WINDOW,      // A Window, like a frame window.
       TYPE_CONTROL,     // A control, like a button.
       TYPE_POPUP,       // An undecorated Window, with transient properties.
       TYPE_MENU         // An undecorated Window, with transient properties
                         // specialized to menus.
     };
+    enum Ownership {
+      // Default. Creator is not responsible for managing the lifetime of the
+      // Widget, it is destroyed when the corresponding NativeWidget is
+      // destroyed.
+      NATIVE_WIDGET_OWNS_WIDGET,
+      // Used when the Widget is owned by someone other than the NativeWidget,
+      // e.g. a scoped_ptr in tests.
+      WIDGET_OWNS_NATIVE_WIDGET
+    };
 
     InitParams();
     explicit InitParams(Type type);
 
     Type type;
     bool child;
     bool transient;
     bool transparent;
     bool accept_events;
     bool can_activate;
     bool keep_on_top;
-    bool delete_on_destroy;
+    Ownership ownership;
     bool mirror_origin_in_rtl;
     bool has_dropshadow;
     // Should the widget be double buffered? Default is false.
     bool double_buffer;
     gfx::NativeView parent;
     Widget* parent_widget;
     gfx::Rect bounds;
     NativeWidget* native_widget;
   };
   static InitParams WindowInitParams();
@@ skipping 288 matching lines @@
   scoped_ptr<DefaultThemeProvider> default_theme_provider_;
 
   // Valid for the lifetime of RunShellDrag(), indicates the view the drag
   // started from.
   View* dragged_view_;
 
   // The compositor for accelerated drawing.
   scoped_refptr<ui::Compositor> compositor_;
 
   // See class documentation for Widget above for a note about ownership.
-  bool delete_on_destroy_;
+  InitParams::Ownership ownership_;
 
   // See set_is_secondary_widget().
   bool is_secondary_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_