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

ui/views/mus/native_widget_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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
@@ skipping 162 matching lines @@
                                  mojo::Shell* shell,
                                  mus::Window* window,
                                  mus::mojom::SurfaceType surface_type)
     : window_(window),
       shell_(shell),
       native_widget_delegate_(delegate),
       surface_type_(surface_type),
       show_state_before_fullscreen_(ui::PLATFORM_WINDOW_STATE_UNKNOWN),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       content_(new aura::Window(this)),
-      close_widget_factory_(this) {}
+      close_widget_factory_(this) {
+  // TODO(fsamuel): Figure out lifetime of |window_|.
+  content_->SetNativeWindowProperty("mus", window_);

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

use the setter you defined in ui/aura/mus

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

Done.

+}
 
 NativeWidgetMus::~NativeWidgetMus() {
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete native_widget_delegate_;
   else
     CloseNow();
 }
 
 // static
 void NativeWidgetMus::SetWindowManagerClientAreaInsets(
@@ skipping 585 matching lines @@
   } else {
     native_widget_delegate_->OnScrollEvent(event);
   }
 }
 
 void NativeWidgetMus::OnGestureEvent(ui::GestureEvent* event) {
   native_widget_delegate_->OnGestureEvent(event);
 }
 
 }  // namespace views