OLD | NEW |
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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 if (!user_state->window_tree_host_factory) { | 407 if (!user_state->window_tree_host_factory) { |
408 user_state->window_tree_host_factory.reset(new ws::WindowTreeHostFactory( | 408 user_state->window_tree_host_factory.reset(new ws::WindowTreeHostFactory( |
409 window_server_.get(), source_info.identity.user_id())); | 409 window_server_.get(), source_info.identity.user_id())); |
410 } | 410 } |
411 user_state->window_tree_host_factory->AddBinding(std::move(request)); | 411 user_state->window_tree_host_factory->AddBinding(std::move(request)); |
412 } | 412 } |
413 | 413 |
414 void Service::BindDiscardableSharedMemoryManagerRequest( | 414 void Service::BindDiscardableSharedMemoryManagerRequest( |
415 const service_manager::BindSourceInfo& source_info, | 415 const service_manager::BindSourceInfo& source_info, |
416 discardable_memory::mojom::DiscardableSharedMemoryManagerRequest request) { | 416 discardable_memory::mojom::DiscardableSharedMemoryManagerRequest request) { |
417 discardable_shared_memory_manager_->Bind(std::move(request)); | 417 discardable_shared_memory_manager_->Bind(source_info, std::move(request)); |
418 } | 418 } |
419 | 419 |
420 void Service::BindWindowServerTestRequest( | 420 void Service::BindWindowServerTestRequest( |
421 const service_manager::BindSourceInfo& source_info, | 421 const service_manager::BindSourceInfo& source_info, |
422 mojom::WindowServerTestRequest request) { | 422 mojom::WindowServerTestRequest request) { |
423 if (!test_config_) | 423 if (!test_config_) |
424 return; | 424 return; |
425 mojo::MakeStrongBinding( | 425 mojo::MakeStrongBinding( |
426 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), | 426 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), |
427 std::move(request)); | 427 std::move(request)); |
428 } | 428 } |
429 | 429 |
430 | 430 |
431 } // namespace ui | 431 } // namespace ui |
OLD | NEW |