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

Side by Side Diff: services/ui/service.cc

Issue 2323393003: Connect mojom::DisplayController from ash to ui. (Closed)
Patch Set: Add comments. Created 4 years, 3 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
« no previous file with comments | « services/ui/service.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "services/ui/service.h" 5 #include "services/ui/service.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 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 registry->AddInterface<mojom::WindowManagerWindowTreeFactory>(this); 206 registry->AddInterface<mojom::WindowManagerWindowTreeFactory>(this);
207 registry->AddInterface<mojom::WindowTreeFactory>(this); 207 registry->AddInterface<mojom::WindowTreeFactory>(this);
208 if (test_config_) 208 if (test_config_)
209 registry->AddInterface<WindowServerTest>(this); 209 registry->AddInterface<WindowServerTest>(this);
210 210
211 // On non-Linux platforms there will be no DeviceDataManager instance and no 211 // On non-Linux platforms there will be no DeviceDataManager instance and no
212 // purpose in adding the Mojo interface to connect to. 212 // purpose in adding the Mojo interface to connect to.
213 if (input_device_server_.IsRegisteredAsObserver()) 213 if (input_device_server_.IsRegisteredAsObserver())
214 input_device_server_.AddInterface(registry); 214 input_device_server_.AddInterface(registry);
215 215
216 platform_screen_->AddInterfaces(registry);
217
216 #if defined(USE_OZONE) 218 #if defined(USE_OZONE)
217 ui::OzonePlatform::GetInstance()->AddInterfaces(registry); 219 ui::OzonePlatform::GetInstance()->AddInterfaces(registry);
218 #endif 220 #endif
219 221
220 return true; 222 return true;
221 } 223 }
222 224
223 void Service::OnFirstDisplayReady() { 225 void Service::OnFirstDisplayReady() {
224 PendingRequests requests; 226 PendingRequests requests;
225 requests.swap(pending_requests_); 227 requests.swap(pending_requests_);
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 mojom::WindowServerTestRequest request) { 356 mojom::WindowServerTestRequest request) {
355 if (!test_config_) 357 if (!test_config_)
356 return; 358 return;
357 mojo::MakeStrongBinding( 359 mojo::MakeStrongBinding(
358 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), 360 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
359 std::move(request)); 361 std::move(request));
360 } 362 }
361 363
362 364
363 } // namespace ui 365 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698