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

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

Issue 2470963002: Makes it possible for clients to directly create WindowTreeHostMus (Closed)
Patch Set: nuke comment Created 4 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
« no previous file with comments | « ui/views/mus/mus_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index f4eb1b8e0867fbb1f32ba74ef6a21e881e33b17a..997bbe1e23da10be75d77bc917c54010c024a8b1 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -15,6 +15,7 @@
#include "ui/aura/mus/property_converter.h"
#include "ui/aura/mus/window_port_mus.h"
#include "ui/aura/mus/window_tree_client.h"
+#include "ui/aura/mus/window_tree_host_mus.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/views/mus/aura_init.h"
@@ -140,10 +141,12 @@ NativeWidget* MusClient::CreateNativeWidget(
std::unique_ptr<aura::WindowPort> MusClient::CreateWindowPort(
aura::Window* window) {
- return base::MakeUnique<aura::WindowPortMus>(window_tree_client_.get());
+ return base::MakeUnique<aura::WindowPortMus>(window_tree_client_.get(),
+ aura::WindowMusType::LOCAL);
}
-void MusClient::OnEmbed(aura::Window* root) {}
+void MusClient::OnEmbed(
+ std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {}
void MusClient::OnLostConnection(aura::WindowTreeClient* client) {}
« no previous file with comments | « ui/views/mus/mus_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698