MacViews: Allow views::Widgets to be parented off NSWindows

ui/views/cocoa/bridged_native_widget.h

 // Copyright 2014 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 UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_
 #define UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/compositor/layer_owner.h"
 #import "ui/accelerated_widget_mac/accelerated_widget_mac.h"
+#import "ui/views/cocoa/bridged_native_widget_owner.h"
 #import "ui/views/cocoa/cocoa_mouse_capture_delegate.h"
 #import "ui/views/focus/focus_manager.h"
 #include "ui/views/ime/input_method_delegate.h"
 #include "ui/views/views_export.h"
 #include "ui/views/widget/widget.h"
 
 @class BridgedContentView;
 @class ViewsNSWindowDelegate;
 
 namespace ui {
 class InputMethod;
 }
 
 namespace views {
 
 class CocoaMouseCapture;
 class InputMethod;
 class NativeWidgetMac;
 class View;
 
 // A bridge to an NSWindow managed by an instance of NativeWidgetMac or
 // DesktopNativeWidgetMac. Serves as a helper class to bridge requests from the
 // NativeWidgetMac to the Cocoa window. Behaves a bit like an aura::Window.
 class VIEWS_EXPORT BridgedNativeWidget : public ui::LayerDelegate,
                                          public ui::LayerOwner,
                                          public internal::InputMethodDelegate,
                                          public CocoaMouseCaptureDelegate,
                                          public FocusChangeListener,
-                                         public ui::AcceleratedWidgetMacNSView {
+                                         public ui::AcceleratedWidgetMacNSView,
+                                         public BridgedNativeWidgetOwner {
  public:
   // Ways of changing the visibility of the bridged NSWindow.
   enum WindowVisibilityState {
     HIDE_WINDOW,               // Hides with -[NSWindow orderOut:].
     SHOW_AND_ACTIVATE_WINDOW,  // Shows with -[NSWindow makeKeyAndOrderFront:].
     SHOW_INACTIVE,             // Shows with -[NSWindow orderWindow:..]. Orders
                                // the window above its parent if it has one.
   };
 
   // Return the size that |window| will take for the given client area |size|,
@@ skipping 90 matching lines @@
   // Creates a ui::Compositor which becomes responsible for drawing the window.
   void CreateLayer(ui::LayerType layer_type, bool translucent);
 
   NativeWidgetMac* native_widget_mac() { return native_widget_mac_; }
   BridgedContentView* ns_view() { return bridged_view_; }
   NSWindow* ns_window() { return window_; }
 
   // The parent widget specified in Widget::InitParams::parent. If non-null, the
   // parent will close children before the parent closes, and children will be
   // raised above their parent when window z-order changes.
-  BridgedNativeWidget* parent() { return parent_; }
+  BridgedNativeWidgetOwner* parent() { return parent_; }
   const std::vector<BridgedNativeWidget*>& child_windows() {
     return child_windows_;
   }
 
   bool target_fullscreen_state() const { return target_fullscreen_state_; }
   bool window_visible() { return window_visible_; }
 
   // Overridden from internal::InputMethodDelegate:
   void DispatchKeyEventPostIME(const ui::KeyEvent& key) override;
 
  private:
   // Closes all child windows. BridgedNativeWidget children will be destroyed.
   void RemoveOrDestroyChildren();
 
-  // Remove the given |child| from |child_windows_|.
-  void RemoveChildWindow(BridgedNativeWidget* child);
-
   // Notify descendants of a visibility change.
   void NotifyVisibilityChangeDown();
 
   // Essentially NativeWidgetMac::GetClientAreaBoundsInScreen().size(), but no
   // coordinate transformations are required from AppKit coordinates.
   gfx::Size GetClientAreaSize() const;
 
   // Creates an owned ui::Compositor. For consistency, these functions reflect
   // those in aura::WindowTreeHost.
   void CreateCompositor();
@@ skipping 28 matching lines @@
   void OnDeviceScaleFactorChanged(float device_scale_factor) override;
   base::Closure PrepareForLayerBoundsChange() override;
 
   // Overridden from ui::AcceleratedWidgetMac:
   NSView* AcceleratedWidgetGetNSView() const override;
   bool AcceleratedWidgetShouldIgnoreBackpressure() const override;
   void AcceleratedWidgetSwapCompleted(
       const std::vector<ui::LatencyInfo>& latency_info) override;
   void AcceleratedWidgetHitError() override;
 
+  // Overridden from BridgedNativeWidgetOwner:
+  NSWindow* GetNSWindow() override;
+  gfx::Vector2d ChildWindowOffset() override;
+  bool IsVisibleParent() override;
+  void RemoveChildWindow(BridgedNativeWidget* child) override;
+
   views::NativeWidgetMac* native_widget_mac_;  // Weak. Owns this.
   base::scoped_nsobject<NSWindow> window_;
   base::scoped_nsobject<ViewsNSWindowDelegate> window_delegate_;
   base::scoped_nsobject<BridgedContentView> bridged_view_;
   scoped_ptr<ui::InputMethod> input_method_;
   scoped_ptr<CocoaMouseCapture> mouse_capture_;
   FocusManager* focus_manager_;  // Weak. Owned by our Widget.
   Widget::InitParams::Type widget_type_;
 
-  BridgedNativeWidget* parent_;  // Weak. If non-null, owns this.
+  BridgedNativeWidgetOwner* parent_;  // Weak. If non-null, owns this.
   std::vector<BridgedNativeWidget*> child_windows_;
 
   base::scoped_nsobject<NSView> compositor_superview_;
   scoped_ptr<ui::AcceleratedWidgetMac> compositor_widget_;
   scoped_ptr<ui::Compositor> compositor_;
 
   // Tracks the bounds when the window last started entering fullscreen. Used to
   // provide an answer for GetRestoredBounds(), but not ever sent to Cocoa (it
   // has its own copy, but doesn't provide access to it).
   gfx::Rect bounds_before_fullscreen_;
@@ skipping 13 matching lines @@
   // If true, the window is either visible, or wants to be visible but is
   // currently hidden due to having a hidden parent.
   bool wants_to_be_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_