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

Side by Side Diff: components/mus/mus_app.cc

Issue 1992443002: Add Mojo IPC based input-device service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_ddm
Patch Set: Fixes for comments. Created 4 years, 6 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/mus/mus_app.h" 5 #include "components/mus/mus_app.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 connection->AddInterface<Gpu>(this); 198 connection->AddInterface<Gpu>(this);
199 connection->AddInterface<mojom::Clipboard>(this); 199 connection->AddInterface<mojom::Clipboard>(this);
200 connection->AddInterface<mojom::DisplayManager>(this); 200 connection->AddInterface<mojom::DisplayManager>(this);
201 connection->AddInterface<mojom::UserAccessManager>(this); 201 connection->AddInterface<mojom::UserAccessManager>(this);
202 connection->AddInterface<WindowTreeHostFactory>(this); 202 connection->AddInterface<WindowTreeHostFactory>(this);
203 connection->AddInterface<mojom::WindowManagerFactoryService>(this); 203 connection->AddInterface<mojom::WindowManagerFactoryService>(this);
204 connection->AddInterface<mojom::WindowTreeFactory>(this); 204 connection->AddInterface<mojom::WindowTreeFactory>(this);
205 if (test_config_) 205 if (test_config_)
206 connection->AddInterface<WindowServerTest>(this); 206 connection->AddInterface<WindowServerTest>(this);
207 207
208 input_device_server_.RegisterInterface(connection);
209
208 if (use_chrome_gpu_command_buffer_) { 210 if (use_chrome_gpu_command_buffer_) {
209 connection->AddInterface<mojom::GpuService>(this); 211 connection->AddInterface<mojom::GpuService>(this);
210 } else { 212 } else {
211 connection->AddInterface<Gpu>(this); 213 connection->AddInterface<Gpu>(this);
212 } 214 }
213 215
214 return true; 216 return true;
215 } 217 }
216 218
217 void MusApp::OnFirstDisplayReady() { 219 void MusApp::OnFirstDisplayReady() {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 platform_display_init_params_.display_bounds = bounds; 321 platform_display_init_params_.display_bounds = bounds;
320 platform_display_init_params_.display_id = id; 322 platform_display_init_params_.display_id = id;
321 323
322 // Display manages its own lifetime. 324 // Display manages its own lifetime.
323 ws::Display* host_impl = 325 ws::Display* host_impl =
324 new ws::Display(window_server_.get(), platform_display_init_params_); 326 new ws::Display(window_server_.get(), platform_display_init_params_);
325 host_impl->Init(nullptr); 327 host_impl->Init(nullptr);
326 } 328 }
327 329
328 } // namespace mus 330 } // namespace mus
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698