Change the meaning of "Widget::GetTopLevelWidget()" to mean the logical top level Window in the v...

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 135 matching lines @@
 }
 
 Widget::~Widget() {
   while (!event_stack_.empty()) {
     event_stack_.top()->reset();
     event_stack_.pop();
   }
 
   DestroyRootView();
 
-  if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET)
+  if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET) {
+    CloseNow();
     delete native_widget_;
+  }
 }
 
 // static
 Widget* Widget::CreateWindow(WidgetDelegate* delegate) {
   return CreateWindowWithParentAndBounds(delegate, NULL, gfx::Rect());
 }
 
 // static
 Widget* Widget::CreateWindowWithParent(WidgetDelegate* delegate,
                                        gfx::NativeWindow parent) {
@@ skipping 155 matching lines @@
 }
 
 // Converted methods (see header) ----------------------------------------------
 
 Widget* Widget::GetTopLevelWidget() {
   return const_cast<Widget*>(
       const_cast<const Widget*>(this)->GetTopLevelWidget());
 }
 
 const Widget* Widget::GetTopLevelWidget() const {
-  internal::NativeWidgetPrivate* native_widget =
-      internal::NativeWidgetPrivate::GetTopLevelNativeWidget(GetNativeView());
-  return native_widget ? native_widget->GetWidget() : NULL;
+  return native_widget_->GetTopLevelWidget();
 }
 
 void Widget::SetContentsView(View* view) {
   root_view_->SetContentsView(view);
 }
 
 gfx::Rect Widget::GetWindowScreenBounds() const {
   return native_widget_->GetWindowScreenBounds();
 }
 
@@ skipping 666 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views