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

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 118 matching lines @@
 #include "content/browser/web_contents/web_contents_android.h"
 #endif  // OS_ANDROID && !USE_AURA
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #endif
 
 #if defined(MOJO_SHELL_CLIENT)
 #include "content/browser/web_contents/web_contents_view_mus.h"
 #include "content/public/common/mojo_shell_connection.h"
+#include "ui/aura/mus/mus_util.h"
 #endif
 
 namespace content {
 namespace {
 
 const int kMinimumDelayBetweenLoadingUpdatesMS = 100;
 const char kDotGoogleDotCom[] = ".google.com";
 
 #if defined(OS_ANDROID)
 const char kWebContentsAndroidKey[] = "web_contents_android";
@@ skipping 1223 matching lines @@
       !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
     view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
                                          view_.Pass(),
                                          &render_view_host_delegate_view_));
   }
 
 #if defined(MOJO_SHELL_CLIENT)
   if (MojoShellConnection::Get() &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseMusInRenderer)) {
-    view_.reset(new WebContentsViewMus(this, view_.Pass(),
-                                       &render_view_host_delegate_view_));
+    mus::Window* window = aura::GetMusWindow(params.context);
+    if (window) {
+      view_.reset(new WebContentsViewMus(this, window, view_.Pass(),
+                                         &render_view_host_delegate_view_));
+    }
   }
 #endif
 
   CHECK(render_view_host_delegate_view_);
   CHECK(view_.get());
 
   gfx::Size initial_size = params.initial_size;
   view_->CreateView(initial_size, params.context);
 
 #if defined(ENABLE_PLUGINS)
@@ skipping 3395 matching lines @@
   return NULL;
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content