mustash: Enable connections to mus from the Chrome renderer [take 2]

content/browser/renderer_host/render_widget_host_view_mus.h

 // Copyright 2015 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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MUS_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MUS_H_
 
 #include "base/macros.h"
+#include "components/mus/public/cpp/scoped_window_ptr.h"
+#include "components/mus/public/cpp/window.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/public/browser/render_process_host_observer.h"
 
 namespace content {
 
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 struct NativeWebKeyboardEvent;
 
 // See comments in render_widget_host_view.h about this class and its members.
 // This version of RenderWidgetHostView is for builds of Chrome that run through
 // the mojo shell and use the Mandoline UI Service (Mus). Mus is responsible for
 // windowing, compositing, and input event dispatch. The purpose of
 // RenderWidgetHostViewMus is to manage the mus::Window owned by the content
 // embedder. The browser is the owner of the mus::Window, controlling properties
 // such as visibility, and bounds. Some aspects such as input, focus, and cursor
 // are managed by Mus directly. Input event routing will be plumbed directly to
 // the renderer from Mus.
 class CONTENT_EXPORT RenderWidgetHostViewMus : public RenderWidgetHostViewBase {
  public:
   RenderWidgetHostViewMus(
+      mus::Window* parent_window,
       RenderWidgetHostImpl* widget,
       base::WeakPtr<RenderWidgetHostViewBase> platform_view);
   ~RenderWidgetHostViewMus() override;
 
  private:
   // RenderWidgetHostView implementation.
   void InitAsChild(gfx::NativeView parent_view) override;
   RenderWidgetHost* GetRenderWidgetHost() const override;
   void SetSize(const gfx::Size& size) override;
   void SetBounds(const gfx::Rect& rect) override;
@@ skipping 73 matching lines @@
   void LockCompositingSurface() override;
   void UnlockCompositingSurface() override;
 
 #if defined(OS_WIN)
   void SetParentNativeViewAccessible(
       gfx::NativeViewAccessible accessible_parent) override;
   gfx::NativeViewId GetParentForWindowlessPlugin() const override;
 #endif
 
   RenderWidgetHostImpl* host_;
+  scoped_ptr<mus::ScopedWindowPtr> window_;
   gfx::Size size_;
   // The platform view for this RenderWidgetHostView.
   // RenderWidgetHostViewMus mostly only cares about stuff related to
   // compositing, the rest are directly forwared to this |platform_view_|.
   base::WeakPtr<RenderWidgetHostViewBase> platform_view_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMus);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MUS_H_