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 "mash/package/mash_packaged_service.h" | 5 #include "mash/package/mash_packaged_service.h" |
6 | 6 |
7 #include "ash/autoclick/mus/autoclick_application.h" | 7 #include "ash/autoclick/mus/autoclick_application.h" |
8 #include "ash/mus/window_manager_application.h" | 8 #include "ash/mus/window_manager_application.h" |
9 #include "ash/touch_hud/mus/touch_hud_application.h" | 9 #include "ash/touch_hud/mus/touch_hud_application.h" |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/debug/debugger.h" | 12 #include "base/debug/debugger.h" |
13 #include "mash/catalog_viewer/catalog_viewer.h" | 13 #include "mash/catalog_viewer/catalog_viewer.h" |
| 14 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h" |
| 15 #include "mash/quick_launch/public/interfaces/constants.mojom.h" |
14 #include "mash/quick_launch/quick_launch.h" | 16 #include "mash/quick_launch/quick_launch.h" |
| 17 #include "mash/session/public/interfaces/constants.mojom.h" |
15 #include "mash/session/session.h" | 18 #include "mash/session/session.h" |
| 19 #include "mash/task_viewer/public/interfaces/constants.mojom.h" |
16 #include "mash/task_viewer/task_viewer.h" | 20 #include "mash/task_viewer/task_viewer.h" |
17 #include "services/service_manager/public/cpp/service_context.h" | 21 #include "services/service_manager/public/cpp/service_context.h" |
18 #include "services/ui/ime/test_ime_driver/test_ime_application.h" | 22 #include "services/ui/ime/test_ime_driver/test_ime_application.h" |
19 #include "services/ui/public/interfaces/constants.mojom.h" | 23 #include "services/ui/public/interfaces/constants.mojom.h" |
20 #include "services/ui/service.h" | 24 #include "services/ui/service.h" |
21 | 25 |
22 #if defined(OS_LINUX) | 26 #if defined(OS_LINUX) |
23 #include "components/font_service/font_service_app.h" | 27 #include "components/font_service/font_service_app.h" |
24 #endif | 28 #endif |
25 | 29 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 if (index != std::string::npos && | 74 if (index != std::string::npos && |
71 name.substr(index + 1) == debugger_target) { | 75 name.substr(index + 1) == debugger_target) { |
72 LOG(WARNING) << "waiting for debugger to attach for service " << name; | 76 LOG(WARNING) << "waiting for debugger to attach for service " << name; |
73 base::debug::WaitForDebugger(120, true); | 77 base::debug::WaitForDebugger(120, true); |
74 } | 78 } |
75 } | 79 } |
76 if (name == "ash") | 80 if (name == "ash") |
77 return base::WrapUnique(new ash::mus::WindowManagerApplication); | 81 return base::WrapUnique(new ash::mus::WindowManagerApplication); |
78 if (name == "accessibility_autoclick") | 82 if (name == "accessibility_autoclick") |
79 return base::WrapUnique(new ash::autoclick::AutoclickApplication); | 83 return base::WrapUnique(new ash::autoclick::AutoclickApplication); |
80 if (name == "catalog_viewer") | 84 if (name == catalog_viewer::mojom::kServiceName) |
81 return base::WrapUnique(new mash::catalog_viewer::CatalogViewer); | 85 return base::WrapUnique(new mash::catalog_viewer::CatalogViewer); |
82 if (name == "touch_hud") | 86 if (name == "touch_hud") |
83 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); | 87 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); |
84 if (name == "mash_session") | 88 if (name == session::mojom::kServiceName) |
85 return base::WrapUnique(new mash::session::Session); | 89 return base::WrapUnique(new mash::session::Session); |
86 if (name == ui::mojom::kServiceName) | 90 if (name == ui::mojom::kServiceName) |
87 return base::WrapUnique(new ui::Service); | 91 return base::WrapUnique(new ui::Service); |
88 if (name == "quick_launch") | 92 if (name == quick_launch::mojom::kServiceName) |
89 return base::WrapUnique(new mash::quick_launch::QuickLaunch); | 93 return base::WrapUnique(new mash::quick_launch::QuickLaunch); |
90 if (name == "task_viewer") | 94 if (name == task_viewer::mojom::kServiceName) |
91 return base::WrapUnique(new mash::task_viewer::TaskViewer); | 95 return base::WrapUnique(new mash::task_viewer::TaskViewer); |
92 if (name == "test_ime_driver") | 96 if (name == "test_ime_driver") |
93 return base::WrapUnique(new ui::test::TestIMEApplication); | 97 return base::WrapUnique(new ui::test::TestIMEApplication); |
94 #if defined(OS_LINUX) | 98 #if defined(OS_LINUX) |
95 if (name == "font_service") | 99 if (name == "font_service") |
96 return base::WrapUnique(new font_service::FontServiceApp); | 100 return base::WrapUnique(new font_service::FontServiceApp); |
97 #endif | 101 #endif |
98 return nullptr; | 102 return nullptr; |
99 } | 103 } |
100 | 104 |
101 } // namespace mash | 105 } // namespace mash |
OLD | NEW |