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

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

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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
« no previous file with comments | « ash/sysui/sysui_application.h ('k') | chrome/app/mash/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
(...skipping 12 matching lines...) Expand all
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"
34 #include "components/mus/public/cpp/property_type_converters.h"
35 #include "components/mus/public/interfaces/input_devices/input_device_server.moj om.h"
36 #include "services/catalog/public/cpp/resource_loader.h" 33 #include "services/catalog/public/cpp/resource_loader.h"
37 #include "services/shell/public/cpp/connector.h" 34 #include "services/shell/public/cpp/connector.h"
35 #include "services/ui/common/gpu_service.h"
36 #include "services/ui/public/cpp/property_type_converters.h"
37 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom. h"
38 #include "ui/aura/env.h" 38 #include "ui/aura/env.h"
39 #include "ui/base/resource/resource_bundle.h" 39 #include "ui/base/resource/resource_bundle.h"
40 #include "ui/base/ui_base_paths.h" 40 #include "ui/base/ui_base_paths.h"
41 #include "ui/display/display.h" 41 #include "ui/display/display.h"
42 #include "ui/display/screen.h" 42 #include "ui/display/screen.h"
43 #include "ui/message_center/message_center.h" 43 #include "ui/message_center/message_center.h"
44 #include "ui/platform_window/stub/stub_window.h" 44 #include "ui/platform_window/stub/stub_window.h"
45 #include "ui/views/mus/aura_init.h" 45 #include "ui/views/mus/aura_init.h"
46 #include "ui/views/mus/native_widget_mus.h" 46 #include "ui/views/mus/native_widget_mus.h"
47 #include "ui/views/mus/window_manager_connection.h" 47 #include "ui/views/mus/window_manager_connection.h"
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 mojom::WallpaperControllerRequest request) { 337 mojom::WallpaperControllerRequest request) {
338 mojom::WallpaperController* wallpaper_controller = 338 mojom::WallpaperController* wallpaper_controller =
339 static_cast<UserWallpaperDelegateMus*>( 339 static_cast<UserWallpaperDelegateMus*>(
340 Shell::GetInstance()->user_wallpaper_delegate()); 340 Shell::GetInstance()->user_wallpaper_delegate());
341 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, 341 wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
342 std::move(request)); 342 std::move(request));
343 } 343 }
344 344
345 } // namespace sysui 345 } // namespace sysui
346 } // namespace ash 346 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sysui/sysui_application.h ('k') | chrome/app/mash/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698