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

Unified Diff: services/ui/demo/mus_demo.cc

Issue 2459123003: Unsplit the MUS demo. (Closed)
Patch Set: Fixed gn check 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 | « services/ui/demo/mus_demo.h ('k') | services/ui/demo/mus_demo_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/demo/mus_demo.cc
diff --git a/services/ui/demo/mus_demo.cc b/services/ui/demo/mus_demo.cc
index ccf221fae5c90d115ffd43ecdd9471c8c0a33ace..d151d9d0b64cb0e00acb908f0d52c4abcfaa25b4 100644
--- a/services/ui/demo/mus_demo.cc
+++ b/services/ui/demo/mus_demo.cc
@@ -63,10 +63,15 @@ MusDemo::MusDemo() {}
MusDemo::~MusDemo() {}
-void MusDemo::Start(service_manager::Connector* connector) {
- gpu_service_ = GpuService::Create(connector);
+void MusDemo::OnStart(const service_manager::ServiceInfo& info) {
+ gpu_service_ = GpuService::Create(connector());
window_tree_client_ = base::MakeUnique<WindowTreeClient>(this, this);
- window_tree_client_->ConnectAsWindowManager(connector);
+ window_tree_client_->ConnectAsWindowManager(connector());
+}
+
+bool MusDemo::OnConnect(const service_manager::ServiceInfo& remote_info,
+ service_manager::InterfaceRegistry* registry) {
+ return true;
}
void MusDemo::OnEmbed(Window* window) {
« no previous file with comments | « services/ui/demo/mus_demo.h ('k') | services/ui/demo/mus_demo_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698