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

content/browser/web_contents/web_contents_view_mus.cc

 // 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.
 
 #include "content/browser/web_contents/web_contents_view_mus.h"
 
 #include "build/build_config.h"
+#include "components/mus/public/cpp/window.h"
+#include "components/mus/public/cpp/window_tree_connection.h"
 #include "content/browser/renderer_host/render_widget_host_view_mus.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
 
 using blink::WebDragOperation;
 using blink::WebDragOperationsMask;
 
 namespace content {
 
 WebContentsViewMus::WebContentsViewMus(
     WebContentsImpl* web_contents,
+    mus::Window* parent_window,
     scoped_ptr<WebContentsView> platform_view,
     RenderViewHostDelegateView** delegate_view)
     : web_contents_(web_contents),
       platform_view_(platform_view.Pass()),
       platform_view_delegate_view_(*delegate_view) {
+  DCHECK(parent_window);
   *delegate_view = this;
+  mus::Window* window = parent_window->connection()->NewWindow();
+  window->SetVisible(true);
+  window->SetBounds(gfx::Rect(300, 300));
+  parent_window->AddChild(window);
+  window_.reset(new mus::ScopedWindowPtr(window));
 }
 
 WebContentsViewMus::~WebContentsViewMus() {}
 
 gfx::NativeView WebContentsViewMus::GetNativeView() const {
   return platform_view_->GetNativeView();
 }
 
 gfx::NativeView WebContentsViewMus::GetContentNativeView() const {
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (!rwhv)
     return NULL;
   return rwhv->GetNativeView();
 }
 
 gfx::NativeWindow WebContentsViewMus::GetTopLevelNativeWindow() const {
   return platform_view_->GetTopLevelNativeWindow();
 }
 
 void WebContentsViewMus::GetContainerBounds(gfx::Rect* out) const {
   // TODO(fsamuel): Get the position right.
   out->set_size(size_);
 }
 
 void WebContentsViewMus::SizeContents(const gfx::Size& size) {
   size_ = size;
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
+  window_->window()->SetBounds(gfx::Rect(size));
 }
 
 void WebContentsViewMus::SetInitialFocus() {
   platform_view_->SetInitialFocus();
 }
 
 gfx::Rect WebContentsViewMus::GetViewBounds() const {
   return gfx::Rect(size_);
 }
 
@@ skipping 13 matching lines @@
   size_ = initial_size;
 }
 
 RenderWidgetHostViewBase* WebContentsViewMus::CreateViewForWidget(
     RenderWidgetHost* render_widget_host,
     bool is_guest_view_hack) {
   RenderWidgetHostViewBase* platform_widget =
       platform_view_->CreateViewForWidget(render_widget_host, true);
 
   return new RenderWidgetHostViewMus(
-      RenderWidgetHostImpl::From(render_widget_host),
+      window_->window(), RenderWidgetHostImpl::From(render_widget_host),
       platform_widget->GetWeakPtr());
 }
 
 RenderWidgetHostViewBase* WebContentsViewMus::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
   return platform_view_->CreateViewForPopupWidget(render_widget_host);
 }
 
 void WebContentsViewMus::SetPageTitle(const base::string16& title) {}
 
@@ skipping 53 matching lines @@
 
 void WebContentsViewMus::StartDragging(const DropData& drop_data,
                                        WebDragOperationsMask ops,
                                        const gfx::ImageSkia& image,
                                        const gfx::Vector2d& image_offset,
                                        const DragEventSourceInfo& event_info) {
   // TODO(fsamuel): Implement drag and drop.
 }
 
 }  // namespace content