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 12 matching lines...) Expand all Loading... |
23 #include "ash/sysui/app_list_presenter_mus.h" | 23 #include "ash/sysui/app_list_presenter_mus.h" |
24 #include "ash/sysui/keyboard_ui_mus.h" | 24 #include "ash/sysui/keyboard_ui_mus.h" |
25 #include "ash/sysui/shelf_delegate_mus.h" | 25 #include "ash/sysui/shelf_delegate_mus.h" |
26 #include "ash/sysui/shell_delegate_mus.h" | 26 #include "ash/sysui/shell_delegate_mus.h" |
27 #include "ash/sysui/stub_context_factory.h" | 27 #include "ash/sysui/stub_context_factory.h" |
28 #include "ash/sysui/user_wallpaper_delegate_mus.h" | 28 #include "ash/sysui/user_wallpaper_delegate_mus.h" |
29 #include "base/bind.h" | 29 #include "base/bind.h" |
30 #include "base/files/file_path.h" | 30 #include "base/files/file_path.h" |
31 #include "base/path_service.h" | 31 #include "base/path_service.h" |
32 #include "base/threading/sequenced_worker_pool.h" | 32 #include "base/threading/sequenced_worker_pool.h" |
| 33 #include "components/mus/common/gpu_service.h" |
33 #include "components/mus/public/cpp/property_type_converters.h" | 34 #include "components/mus/public/cpp/property_type_converters.h" |
34 #include "components/mus/public/interfaces/input_devices/input_device_server.moj
om.h" | 35 #include "components/mus/public/interfaces/input_devices/input_device_server.moj
om.h" |
35 #include "services/catalog/public/cpp/resource_loader.h" | 36 #include "services/catalog/public/cpp/resource_loader.h" |
36 #include "services/shell/public/cpp/connector.h" | 37 #include "services/shell/public/cpp/connector.h" |
37 #include "ui/aura/env.h" | 38 #include "ui/aura/env.h" |
38 #include "ui/base/resource/resource_bundle.h" | 39 #include "ui/base/resource/resource_bundle.h" |
39 #include "ui/base/ui_base_paths.h" | 40 #include "ui/base/ui_base_paths.h" |
40 #include "ui/display/display.h" | 41 #include "ui/display/display.h" |
41 #include "ui/display/screen.h" | 42 #include "ui/display/screen.h" |
42 #include "ui/message_center/message_center.h" | 43 #include "ui/message_center/message_center.h" |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 DISALLOW_COPY_AND_ASSIGN(AshInit); | 302 DISALLOW_COPY_AND_ASSIGN(AshInit); |
302 }; | 303 }; |
303 | 304 |
304 SysUIApplication::SysUIApplication() {} | 305 SysUIApplication::SysUIApplication() {} |
305 | 306 |
306 SysUIApplication::~SysUIApplication() {} | 307 SysUIApplication::~SysUIApplication() {} |
307 | 308 |
308 void SysUIApplication::Initialize(::shell::Connector* connector, | 309 void SysUIApplication::Initialize(::shell::Connector* connector, |
309 const ::shell::Identity& identity, | 310 const ::shell::Identity& identity, |
310 uint32_t id) { | 311 uint32_t id) { |
| 312 mus::GpuService::Initialize(connector); |
| 313 |
311 ash_init_.reset(new AshInit()); | 314 ash_init_.reset(new AshInit()); |
312 ash_init_->Initialize(connector, identity); | 315 ash_init_->Initialize(connector, identity); |
313 | 316 |
314 mus::mojom::InputDeviceServerPtr server; | 317 mus::mojom::InputDeviceServerPtr server; |
315 connector->ConnectToInterface("mojo:mus", &server); | 318 connector->ConnectToInterface("mojo:mus", &server); |
316 input_device_client_.Connect(std::move(server)); | 319 input_device_client_.Connect(std::move(server)); |
317 } | 320 } |
318 | 321 |
319 bool SysUIApplication::AcceptConnection(::shell::Connection* connection) { | 322 bool SysUIApplication::AcceptConnection(::shell::Connection* connection) { |
320 connection->AddInterface<mash::shelf::mojom::ShelfController>(this); | 323 connection->AddInterface<mash::shelf::mojom::ShelfController>(this); |
(...skipping 13 matching lines...) Expand all Loading... |
334 mojom::WallpaperControllerRequest request) { | 337 mojom::WallpaperControllerRequest request) { |
335 mojom::WallpaperController* wallpaper_controller = | 338 mojom::WallpaperController* wallpaper_controller = |
336 static_cast<UserWallpaperDelegateMus*>( | 339 static_cast<UserWallpaperDelegateMus*>( |
337 Shell::GetInstance()->user_wallpaper_delegate()); | 340 Shell::GetInstance()->user_wallpaper_delegate()); |
338 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, | 341 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, |
339 std::move(request)); | 342 std::move(request)); |
340 } | 343 } |
341 | 344 |
342 } // namespace sysui | 345 } // namespace sysui |
343 } // namespace ash | 346 } // namespace ash |
OLD | NEW |