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

views/widget/native_widget_views.h

Index: views/widget/native_widget_views.h
===================================================================
--- views/widget/native_widget_views.h	(revision 91561)
+++ views/widget/native_widget_views.h	(working copy)
@@ -31,6 +31,10 @@
 
   void OnActivate(bool active);
 
+  void set_delete_native_view(bool delete_native_view) {
+    delete_native_view_ = delete_native_view;
+  }
+
   internal::NativeWidgetDelegate* delegate() { return delegate_; }
 
  protected:
@@ -44,6 +48,7 @@
   virtual const Widget* GetWidget() const OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
+  virtual Widget* GetTopLevelWidget() OVERRIDE;
   virtual const ui::Compositor* GetCompositor() const OVERRIDE;
   virtual ui::Compositor* GetCompositor() OVERRIDE;
   virtual void MarkLayerDirty() OVERRIDE;
@@ -114,6 +119,9 @@
   internal::NativeWidgetPrivate* GetParentNativeWidget();
   const internal::NativeWidgetPrivate* GetParentNativeWidget() const;
 
+  // Called by the NativeWidgetView when it is deleted.
+  void OnDestroy();
+
   internal::NativeWidgetDelegate* delegate_;
 
   internal::NativeWidgetView* view_;
@@ -131,9 +139,14 @@
 
   Widget* hosting_widget_;
 
+  // See class documentation for Widget in widget.h for a note about ownership.
+  Widget::InitParams::Ownership ownership_;
+
+  bool delete_native_view_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetViews);
 };
 
-}
+}  // namespace views
 
 #endif  // VIEWS_WIDGET_NATIVE_WIDGET_VIEWS_H_