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

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 273f864216521154bca581126385875967bd4a02..788d2f0d4506092597bff6d6db9417ae429d5564 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/debug/stack_trace.h"

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

remove

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

Done.

 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ -134,6 +135,7 @@
 #endif
 
 #if defined(MOJO_SHELL_CLIENT)
+#include "content/browser/mus_util.h"
 #include "content/browser/web_contents/web_contents_view_mus.h"
 #include "content/public/common/mojo_shell_connection.h"
 #endif
@@ -417,6 +419,7 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context)
 #endif
 
   wake_lock_service_context_.reset(new WakeLockServiceContext(this));
+  // base::debug::StackTrace().Print();

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

remove

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

Done.

 }
 
 WebContentsImpl::~WebContentsImpl() {
@@ -534,6 +537,7 @@ WebContentsImpl* WebContentsImpl::CreateWithOpener(
     // bit to true.
     new_contents->is_subframe_ = true;
   }
+

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

undo

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

Done.

   new_contents->Init(params);
   return new_contents;
 }
@@ -1379,8 +1383,11 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
   if (MojoShellConnection::Get() &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseMusInRenderer)) {
-    view_.reset(new WebContentsViewMus(this, view_.Pass(),
-                                       &render_view_host_delegate_view_));
+    mus::Window* window = GetMusWindow(params.context);
+    if (window) {
+      view_.reset(new WebContentsViewMus(this, window, view_.Pass(),
+                                         &render_view_host_delegate_view_));
+    }
   }
 #endif