| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/mus/sysui_application.h" | 5 #include "ash/mus/sysui_application.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 | 307 |
| 308 SysUIApplication::SysUIApplication() {} | 308 SysUIApplication::SysUIApplication() {} |
| 309 | 309 |
| 310 SysUIApplication::~SysUIApplication() {} | 310 SysUIApplication::~SysUIApplication() {} |
| 311 | 311 |
| 312 void SysUIApplication::Initialize(::shell::Connector* connector, | 312 void SysUIApplication::Initialize(::shell::Connector* connector, |
| 313 const ::shell::Identity& identity, | 313 const ::shell::Identity& identity, |
| 314 uint32_t id) { | 314 uint32_t id) { |
| 315 ash_init_.reset(new AshInit()); | 315 ash_init_.reset(new AshInit()); |
| 316 ash_init_->Initialize(connector, identity); | 316 ash_init_->Initialize(connector, identity); |
| 317 |
| 318 input_device_client_.Initialize(connector); |
| 317 } | 319 } |
| 318 | 320 |
| 319 bool SysUIApplication::AcceptConnection(::shell::Connection* connection) { | 321 bool SysUIApplication::AcceptConnection(::shell::Connection* connection) { |
| 320 connection->AddInterface<mash::shelf::mojom::ShelfController>(this); | 322 connection->AddInterface<mash::shelf::mojom::ShelfController>(this); |
| 321 return true; | 323 return true; |
| 322 } | 324 } |
| 323 | 325 |
| 324 void SysUIApplication::Create( | 326 void SysUIApplication::Create( |
| 325 ::shell::Connection* connection, | 327 ::shell::Connection* connection, |
| 326 mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) { | 328 mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) { |
| 327 mash::shelf::mojom::ShelfController* shelf_controller = | 329 mash::shelf::mojom::ShelfController* shelf_controller = |
| 328 static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate()); | 330 static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate()); |
| 329 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request)); | 331 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request)); |
| 330 } | 332 } |
| 331 | 333 |
| 332 } // namespace sysui | 334 } // namespace sysui |
| 333 } // namespace ash | 335 } // namespace ash |
| OLD | NEW |