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

views/widget/native_widget_views.h

 // 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.
 
 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_VIEWS_H_
 #define VIEWS_WIDGET_NATIVE_WIDGET_VIEWS_H_
 #pragma once
 
 #include "base/message_loop.h"
 #include "ui/gfx/transform.h"
@@ skipping 13 matching lines @@
  public:
   explicit NativeWidgetViews(internal::NativeWidgetDelegate* delegate);
   virtual ~NativeWidgetViews();
 
   // TODO(beng): remove.
   View* GetView();
   const View* GetView() const;
 
   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:
   // Overridden from internal::NativeWidgetPrivate:
   virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
   virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
   virtual void UpdateFrameAfterFrameChange() OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual void FrameTypeChanged() OVERRIDE;
   virtual Widget* GetWidget() OVERRIDE;
   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;
   virtual void CalculateOffsetToAncestorWithLayer(gfx::Point* offset,
                                                   View** ancestor) OVERRIDE;
   virtual void ViewRemoved(View* view) OVERRIDE;
   virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;
   virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;
   virtual TooltipManager* GetTooltipManager() const OVERRIDE;
   virtual bool IsScreenReaderActive() const OVERRIDE;
@@ skipping 50 matching lines @@
   virtual void RunShellDrag(View* view,
                             const ui::OSExchangeData& data,
                             int operation) OVERRIDE;
   virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
   virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
 
  private:
   internal::NativeWidgetPrivate* GetParentNativeWidget();
   const internal::NativeWidgetPrivate* GetParentNativeWidget() const;
 
+  // Called by the NativeWidgetView when it is deleted.
+  void OnDestroy();
+
   internal::NativeWidgetDelegate* delegate_;
 
   internal::NativeWidgetView* view_;
 
   bool active_;
 
   bool minimized_;
 
   // The following factory is used for calls to close the NativeWidgetViews
   // instance.
   ScopedRunnableMethodFactory<NativeWidgetViews> close_widget_factory_;
 
   gfx::Rect restored_bounds_;
   ui::Transform restored_transform_;
 
   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_