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

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

Issue 2760453003: Work In Progess
Patch Set: convert local_state to use pre_client_store_ Created 3 years, 9 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/manifest.json ('k') | ui/display/manager/BUILD.gn » ('j') | 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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 screen_manager_->AddInterfaces(registry); 224 screen_manager_->AddInterfaces(registry);
225 225
226 #if defined(USE_OZONE) 226 #if defined(USE_OZONE)
227 ui::OzonePlatform::GetInstance()->AddInterfaces(registry); 227 ui::OzonePlatform::GetInstance()->AddInterfaces(registry);
228 #endif 228 #endif
229 229
230 return true; 230 return true;
231 } 231 }
232 232
233 void Service::StartDisplayInit() { 233 void Service::StartDisplayInit() {
234 screen_manager_->Init(window_server_->display_manager()); 234 screen_manager_->Init(window_server_->display_manager(),
235 context()->connector());
235 } 236 }
236 237
237 void Service::OnFirstDisplayReady() { 238 void Service::OnFirstDisplayReady() {
238 PendingRequests requests; 239 PendingRequests requests;
239 requests.swap(pending_requests_); 240 requests.swap(pending_requests_);
240 for (auto& request : requests) { 241 for (auto& request : requests) {
241 if (request->wtf_request) 242 if (request->wtf_request)
242 Create(request->remote_identity, std::move(*request->wtf_request)); 243 Create(request->remote_identity, std::move(*request->wtf_request));
243 else 244 else
244 Create(request->remote_identity, std::move(*request->dm_request)); 245 Create(request->remote_identity, std::move(*request->dm_request));
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 mojom::WindowServerTestRequest request) { 366 mojom::WindowServerTestRequest request) {
366 if (!test_config_) 367 if (!test_config_)
367 return; 368 return;
368 mojo::MakeStrongBinding( 369 mojo::MakeStrongBinding(
369 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), 370 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
370 std::move(request)); 371 std::move(request));
371 } 372 }
372 373
373 374
374 } // namespace ui 375 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/manifest.json ('k') | ui/display/manager/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698