Fix for black-hole.

views/widget/widget.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/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ skipping 55 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ScopedEvent);
 };
 
 // A default implementation of WidgetDelegate, used by Widget when no
 // WidgetDelegate is supplied.
 class DefaultWidgetDelegate : public WidgetDelegate {
  public:
   DefaultWidgetDelegate(Widget* widget, const Widget::InitParams& params)
       : widget_(widget),
-        can_activate_(params.type != Widget::InitParams::TYPE_POPUP) {
+        can_activate_(!params.child &&
+                      params.type != Widget::InitParams::TYPE_POPUP) {
   }
   virtual ~DefaultWidgetDelegate() {}
 
   // Overridden from WidgetDelegate:
   virtual void DeleteDelegate() OVERRIDE {
     delete this;
   }
   virtual Widget* GetWidget() {
     return widget_;
   }
@@ skipping 304 matching lines @@
   // property is gone after gobject gets deleted. Short circuit here
   // for toplevel so that InputMethod can remove itself from
   // focus manager.
   if (is_top_level())
     return this;
   return native_widget_->GetTopLevelWidget();
 }
 
 void Widget::SetContentsView(View* view) {
   root_view_->SetContentsView(view);
+  if (non_client_view_ != view)
+    non_client_view_ = NULL;

[sadrul, 2011/09/22 22:12:04]

If this is necessary only for tests, can there be some check that for non-tests
to make sure this is not called? I am not sure if it is desirable to restrict
doing this for normal cases.

[oshima, 2011/09/22 22:27:05]

This is a bug which has to be fixed in normal case as well. When we reset the
content view to something else, non_client_view_ is no longer valid and has to
be set to NULL. (although there is no place in browser code that does this.)

 }
 
 View* Widget::GetContentsView() {
   return root_view_->GetContentsView();
 }
 
 gfx::Rect Widget::GetWindowScreenBounds() const {
   return native_widget_->GetWindowScreenBounds();
 }
 
@@ skipping 656 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, protected:
 
 internal::RootView* Widget::CreateRootView() {
   return new internal::RootView(this);
 }
 
 void Widget::DestroyRootView() {
+  non_client_view_ = NULL;
   root_view_.reset();
   // Input method has to be destroyed before focus manager.
   input_method_.reset();
   // Defer focus manager's destruction. This is for the case when the
   // focus manager is referenced by a child NativeWidgetGtk (e.g. TabbedPane in
   // a dialog). When gtk_widget_destroy is called on the parent, the destroy
   // signal reaches parent first and then the child. Thus causing the parent
   // NativeWidgetGtk's dtor executed before the child's. If child's view
   // hierarchy references this focus manager, it crashes. This will defer focus
   // manager's destruction after child NativeWidgetGtk's dtor.
@@ skipping 91 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views