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

views/widget/native_widget_gtk.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 "views/widget/native_widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 271 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetGtk, public:
 
 NativeWidgetGtk::NativeWidgetGtk(internal::NativeWidgetDelegate* delegate)
     : is_window_(false),
       delegate_(delegate),
       widget_(NULL),
       window_contents_(NULL),
       child_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
-      delete_on_destroy_(true),
+      ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       transparent_(false),
       ignore_events_(false),
       ignore_drag_leave_(false),
       opacity_(255),
       drag_data_(NULL),
       is_active_(false),
       transient_to_parent_(false),
       got_initial_focus_in_(false),
       has_focus_(false),
       focus_on_creation_(true),
@@ skipping 13 matching lines @@
     MessageLoopForUI* loop = MessageLoopForUI::current();
     if (loop)
       loop->AddObserver(DropObserver::GetInstance());
   }
 }
 
 NativeWidgetGtk::~NativeWidgetGtk() {
   // We need to delete the input method before calling DestroyRootView(),
   // because it'll set focus_manager_ to NULL.
   input_method_.reset();
-  DCHECK(delete_on_destroy_ || widget_ == NULL);
-  if (delete_on_destroy_)
+  DCHECK(ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET ||
+         widget_ == NULL);
+  if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete delegate_;
   // TODO(altimofeev): investigate why OnDestroy could not be called.
   if (!child_)
     ActiveWindowWatcherX::RemoveObserver(this);
 }
 
 GtkWindow* NativeWidgetGtk::GetTransientParent() const {
   return (!child_ && widget_) ?
       gtk_window_get_transient_for(GTK_WINDOW(widget_)) : NULL;
 }
@@ skipping 989 matching lines @@
   HandleGtkGrabBroke();
 }
 
 void NativeWidgetGtk::OnDestroy(GtkWidget* object) {
   if (!child_)
     ActiveWindowWatcherX::RemoveObserver(this);
   // Note that this handler is hooked to GtkObject::destroy.
   // NULL out pointers here since we might still be in an observer list
   // until delstion happens.
   widget_ = window_contents_ = NULL;
-  if (delete_on_destroy_) {
+  if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) {
     // Delays the deletion of this NativeWidgetGtk as we want its children to
     // have access to it when destroyed.
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   }
 }
 
 void NativeWidgetGtk::OnShow(GtkWidget* widget) {
 }
 
 void NativeWidgetGtk::OnMap(GtkWidget* widget) {
@@ skipping 60 matching lines @@
     handled = HandleKeyboardEvent(key);
 
   // Dispatch the key event for bindings processing.
   if (!handled && event && GTK_IS_WINDOW(widget_))
     gtk_bindings_activate_event(GTK_OBJECT(widget_), event);
 }
 
 void NativeWidgetGtk::SetInitParams(const Widget::InitParams& params) {
   DCHECK(!GetNativeView());
 
-  delete_on_destroy_ = params.delete_on_destroy;
+  ownership_ = params.ownership;
   child_ = params.child;
 
   // TODO(beng): The secondary checks here actually obviate the need for
   //             params.transient but that's only because NativeWidgetGtk
   //             considers any top-level widget to be a transient widget. We
   //             will probably want to ammend this assumption at some point.
   if (params.transient || params.parent || params.parent_widget)
     transient_to_parent_  = true;
   if (params.transparent)
     MakeTransparent();
@@ skipping 376 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views