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

views/widget/native_widget_view.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_view.h"
 
 #include "ui/gfx/canvas.h"
 
 namespace views {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetView, public:
 
 // static
 const char NativeWidgetView::kViewClassName[] = "views/NativeWidgetView";
 
 NativeWidgetView::NativeWidgetView(NativeWidgetViews* native_widget)
     : native_widget_(native_widget),
-      sent_create_(false) {
+      sent_create_(false),
+      delete_native_widget_(true) {
 }
 
 NativeWidgetView::~NativeWidgetView() {
+  if (delete_native_widget_) {
+    native_widget_->set_delete_native_view(false);
+    delete native_widget_;
+  }
 }
 
 Widget* NativeWidgetView::GetAssociatedWidget() {
   return native_widget_->delegate()->AsWidget();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetView, View overrides:
 
 void NativeWidgetView::SchedulePaintInternal(const gfx::Rect& r) {
@@ skipping 131 matching lines @@
 }
 
 void NativeWidgetView::PaintComposite() {
   View::PaintComposite();
   GetAssociatedWidget()->GetRootView()->PaintComposite();
 }
 
 }  // namespace internal
 }  // namespace views