| 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/sysui/sysui_application.h" | 5 #include "ash/sysui/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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 input_device_client_.Connect(std::move(server)); | 324 input_device_client_.Connect(std::move(server)); |
| 325 } | 325 } |
| 326 | 326 |
| 327 bool SysUIApplication::OnConnect(::shell::Connection* connection) { | 327 bool SysUIApplication::OnConnect(::shell::Connection* connection) { |
| 328 connection->AddInterface<mash::shelf::mojom::ShelfController>(this); | 328 connection->AddInterface<mash::shelf::mojom::ShelfController>(this); |
| 329 connection->AddInterface<mojom::WallpaperController>(this); | 329 connection->AddInterface<mojom::WallpaperController>(this); |
| 330 return true; | 330 return true; |
| 331 } | 331 } |
| 332 | 332 |
| 333 void SysUIApplication::Create( | 333 void SysUIApplication::Create( |
| 334 ::shell::Connection* connection, | 334 const ::shell::Identity& remote_identity, |
| 335 mash::shelf::mojom::ShelfControllerRequest request) { | 335 mash::shelf::mojom::ShelfControllerRequest request) { |
| 336 mash::shelf::mojom::ShelfController* shelf_controller = | 336 mash::shelf::mojom::ShelfController* shelf_controller = |
| 337 static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate()); | 337 static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate()); |
| 338 DCHECK(shelf_controller); | 338 DCHECK(shelf_controller); |
| 339 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request)); | 339 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request)); |
| 340 } | 340 } |
| 341 | 341 |
| 342 void SysUIApplication::Create(::shell::Connection* connection, | 342 void SysUIApplication::Create(const ::shell::Identity& remote_identity, |
| 343 mojom::WallpaperControllerRequest request) { | 343 mojom::WallpaperControllerRequest request) { |
| 344 mojom::WallpaperController* wallpaper_controller = | 344 mojom::WallpaperController* wallpaper_controller = |
| 345 static_cast<UserWallpaperDelegateMus*>( | 345 static_cast<UserWallpaperDelegateMus*>( |
| 346 Shell::GetInstance()->user_wallpaper_delegate()); | 346 Shell::GetInstance()->user_wallpaper_delegate()); |
| 347 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, | 347 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, |
| 348 std::move(request)); | 348 std::move(request)); |
| 349 } | 349 } |
| 350 | 350 |
| 351 } // namespace sysui | 351 } // namespace sysui |
| 352 } // namespace ash | 352 } // namespace ash |
| OLD | NEW |