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

content/browser/renderer_host/render_widget_host_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/renderer_host/render_widget_host_view_mus.h"
 
+#include "components/mus/public/cpp/window.h"
+#include "components/mus/public/cpp/window_tree_connection.h"
+#include "content/browser/mojo/mojo_shell_client_host.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/common/render_process_client.mojom.h"
+#include "content/public/common/mojo_shell_connection.h"
+#include "mojo/application/public/cpp/application_impl.h"
 
 namespace blink {
 struct WebScreenInfo;
 }
 
 namespace content {
 
 RenderWidgetHostViewMus::RenderWidgetHostViewMus(
+    mus::Window* parent_window,
     RenderWidgetHostImpl* host,
     base::WeakPtr<RenderWidgetHostViewBase> platform_view)
     : host_(host), platform_view_(platform_view) {
+  DCHECK(parent_window);
+  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));
   host_->SetView(this);
+
+  EmbedClient();
 }
 
 RenderWidgetHostViewMus::~RenderWidgetHostViewMus() {}
 
 void RenderWidgetHostViewMus::Show() {
   // TODO(fsamuel): Update visibility in Mus.
   // There is some interstitial complexity that we'll need to figure out here.
   host_->WasShown(ui::LatencyInfo());
 }
 
 void RenderWidgetHostViewMus::Hide() {
   host_->WasHidden();
 }
 
 bool RenderWidgetHostViewMus::IsShowing() {
   return !host_->is_hidden();
 }
 
 void RenderWidgetHostViewMus::SetSize(const gfx::Size& size) {
   size_ = size;
+  window_->window()->SetBounds(gfx::Rect(size));
   host_->WasResized();
 }
 
 void RenderWidgetHostViewMus::SetBounds(const gfx::Rect& rect) {
   SetSize(rect.size());
 }
 
 void RenderWidgetHostViewMus::Focus() {
   // TODO(fsamuel): Request focus for the associated Mus::Window
   // We need to be careful how we propagate focus as we navigate to and
@@ skipping 34 matching lines @@
 
 base::string16 RenderWidgetHostViewMus::GetSelectedText() const {
   return platform_view_->GetSelectedText();
 }
 
 void RenderWidgetHostViewMus::SetTooltipText(
     const base::string16& tooltip_text) {
   // TOOD(fsamuel): Ask window manager for tooltip?
 }
 
+void RenderWidgetHostViewMus::EmbedClient() {
+  std::string url = GetMojoApplicationInstanceURL(host_->GetProcess());

[Ben Goodger (Google), 2015/11/25 04:07:28]

just put this in the ctor since no one else calls it.

[Fady Samuel, 2015/11/25 17:45:52]

Done.

+  mojom::RenderProcessClientPtr render_process_client;
+  MojoShellConnection::Get()->GetApplication()->ConnectToService(
+      url, &render_process_client);
+
+  mus::mojom::WindowTreeClientPtr window_tree_client;
+  render_process_client->OnRenderWidgetHostViewCreated(
+      host_->GetRoutingID(), mojo::GetProxy(&window_tree_client));
+  window_->window()->Embed(window_tree_client.Pass());
+}
+
 void RenderWidgetHostViewMus::InitAsChild(gfx::NativeView parent_view) {
   platform_view_->InitAsChild(parent_view);
 }
 
 RenderWidgetHost* RenderWidgetHostViewMus::GetRenderWidgetHost() const {
   return host_;
 }
 
 void RenderWidgetHostViewMus::InitAsPopup(
     RenderWidgetHostView* parent_host_view,
@@ skipping 166 matching lines @@
 void RenderWidgetHostViewMus::SetParentNativeViewAccessible(
     gfx::NativeViewAccessible accessible_parent) {}
 
 gfx::NativeViewId RenderWidgetHostViewMus::GetParentForWindowlessPlugin()
     const {
   return gfx::NativeViewId();
 }
 #endif
 
 }  // namespace content