Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: ui/views/mus/native_widget_mus.cc

Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't create a RenderWidgetWindowTreeeClientFactory in tests Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/mus/native_widget_mus.cc
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index d51516d71be7ae77097d58a99b670b3c67694697..6d7caac4003f664b4594b0972ef5fb263bc1e02e 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -13,6 +13,7 @@
#include "ui/aura/client/window_tree_client.h"
#include "ui/aura/env.h"
#include "ui/aura/layout_manager.h"
+#include "ui/aura/mus/mus_util.h"
#include "ui/aura/window.h"
#include "ui/base/hit_test.h"
#include "ui/compositor/clip_transform_recorder.h"
@@ -180,7 +181,10 @@ NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
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_|.
+ aura::SetMusWindow(content_, window_);
+}
NativeWidgetMus::~NativeWidgetMus() {
if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
« content/common/render_widget_window_tree_client_factory.mojom ('K') | « ui/aura/mus/mus_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698