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

Side by Side Diff: ash/sysui/sysui_application.cc

Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash. (Closed)
Patch Set: Alternative display info workaround. Created 4 years, 3 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
OLDNEW
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>
11 11
12 #include "ash/common/login_status.h" 12 #include "ash/common/login_status.h"
13 #include "ash/common/material_design/material_design_controller.h" 13 #include "ash/common/material_design/material_design_controller.h"
14 #include "ash/common/shell_window_ids.h" 14 #include "ash/common/shell_window_ids.h"
15 #include "ash/common/wm_shell.h" 15 #include "ash/common/wm_shell.h"
16 #include "ash/display/display_manager.h" 16 #include "ash/display/display_manager.h"
17 #include "ash/host/ash_window_tree_host_init_params.h" 17 #include "ash/host/ash_window_tree_host_init_params.h"
18 #include "ash/host/ash_window_tree_host_platform.h" 18 #include "ash/host/ash_window_tree_host_platform.h"
19 #include "ash/public/interfaces/ash_window_type.mojom.h" 19 #include "ash/public/interfaces/ash_window_type.mojom.h"
20 #include "ash/public/interfaces/container.mojom.h" 20 #include "ash/public/interfaces/container.mojom.h"
21 #include "ash/root_window_settings.h" 21 #include "ash/root_window_settings.h"
22 #include "ash/shell.h" 22 #include "ash/shell.h"
23 #include "ash/shell_init_params.h" 23 #include "ash/shell_init_params.h"
24 #include "ash/sysui/app_list_presenter_mus.h" 24 #include "ash/sysui/app_list_presenter_mus.h"
25 #include "ash/sysui/keyboard_ui_mus.h" 25 #include "ash/sysui/keyboard_ui_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/wallpaper_delegate_mus.h"
29 #include "base/bind.h" 28 #include "base/bind.h"
30 #include "base/files/file_path.h" 29 #include "base/files/file_path.h"
31 #include "base/path_service.h" 30 #include "base/path_service.h"
32 #include "base/threading/sequenced_worker_pool.h" 31 #include "base/threading/sequenced_worker_pool.h"
33 #include "services/catalog/public/cpp/resource_loader.h" 32 #include "services/catalog/public/cpp/resource_loader.h"
34 #include "services/shell/public/cpp/connector.h" 33 #include "services/shell/public/cpp/connector.h"
35 #include "services/ui/public/cpp/property_type_converters.h" 34 #include "services/ui/public/cpp/property_type_converters.h"
36 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom. h" 35 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom. h"
37 #include "ui/aura/env.h" 36 #include "ui/aura/env.h"
38 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 ash_init_.reset(new AshInit()); 315 ash_init_.reset(new AshInit());
317 ash_init_->Initialize(connector(), identity); 316 ash_init_->Initialize(connector(), identity);
318 317
319 ui::mojom::InputDeviceServerPtr server; 318 ui::mojom::InputDeviceServerPtr server;
320 connector()->ConnectToInterface("mojo:ui", &server); 319 connector()->ConnectToInterface("mojo:ui", &server);
321 input_device_client_.Connect(std::move(server)); 320 input_device_client_.Connect(std::move(server));
322 } 321 }
323 322
324 bool SysUIApplication::OnConnect(const ::shell::Identity& remote_identity, 323 bool SysUIApplication::OnConnect(const ::shell::Identity& remote_identity,
325 ::shell::InterfaceRegistry* registry) { 324 ::shell::InterfaceRegistry* registry) {
326 registry->AddInterface<mojom::WallpaperController>(this);
327 return true; 325 return true;
328 } 326 }
329 327
330 void SysUIApplication::Create(const ::shell::Identity& remote_identity,
331 mojom::WallpaperControllerRequest request) {
332 mojom::WallpaperController* wallpaper_controller =
333 static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate());
334 wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
335 std::move(request));
336 }
337
338 } // namespace sysui 328 } // namespace sysui
339 } // namespace ash 329 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698