| 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/quick_launch/quick_launch.h" | 14 #include "mash/quick_launch/quick_launch.h" |
| 15 #include "mash/session/session.h" | 15 #include "mash/session/session.h" |
| 16 #include "mash/task_viewer/task_viewer.h" | 16 #include "mash/task_viewer/task_viewer.h" |
| 17 #include "services/service_manager/public/cpp/service_context.h" | 17 #include "services/service_manager/public/cpp/service_context.h" |
| 18 #include "services/ui/ime/test_ime_driver/test_ime_application.h" | 18 #include "services/ui/ime/test_ime_driver/test_ime_application.h" |
| 19 #include "services/ui/public/interfaces/constants.mojom.h" |
| 19 #include "services/ui/service.h" | 20 #include "services/ui/service.h" |
| 20 | 21 |
| 21 #if defined(OS_LINUX) | 22 #if defined(OS_LINUX) |
| 22 #include "components/font_service/font_service_app.h" | 23 #include "components/font_service/font_service_app.h" |
| 23 #endif | 24 #endif |
| 24 | 25 |
| 25 namespace mash { | 26 namespace mash { |
| 26 | 27 |
| 27 MashPackagedService::MashPackagedService() {} | 28 MashPackagedService::MashPackagedService() {} |
| 28 | 29 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 if (name == "ash") | 76 if (name == "ash") |
| 76 return base::WrapUnique(new ash::mus::WindowManagerApplication); | 77 return base::WrapUnique(new ash::mus::WindowManagerApplication); |
| 77 if (name == "accessibility_autoclick") | 78 if (name == "accessibility_autoclick") |
| 78 return base::WrapUnique(new ash::autoclick::AutoclickApplication); | 79 return base::WrapUnique(new ash::autoclick::AutoclickApplication); |
| 79 if (name == "catalog_viewer") | 80 if (name == "catalog_viewer") |
| 80 return base::WrapUnique(new mash::catalog_viewer::CatalogViewer); | 81 return base::WrapUnique(new mash::catalog_viewer::CatalogViewer); |
| 81 if (name == "touch_hud") | 82 if (name == "touch_hud") |
| 82 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); | 83 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); |
| 83 if (name == "mash_session") | 84 if (name == "mash_session") |
| 84 return base::WrapUnique(new mash::session::Session); | 85 return base::WrapUnique(new mash::session::Session); |
| 85 if (name == "ui") | 86 if (name == ui::mojom::kServiceName) |
| 86 return base::WrapUnique(new ui::Service); | 87 return base::WrapUnique(new ui::Service); |
| 87 if (name == "quick_launch") | 88 if (name == "quick_launch") |
| 88 return base::WrapUnique(new mash::quick_launch::QuickLaunch); | 89 return base::WrapUnique(new mash::quick_launch::QuickLaunch); |
| 89 if (name == "task_viewer") | 90 if (name == "task_viewer") |
| 90 return base::WrapUnique(new mash::task_viewer::TaskViewer); | 91 return base::WrapUnique(new mash::task_viewer::TaskViewer); |
| 91 if (name == "test_ime_driver") | 92 if (name == "test_ime_driver") |
| 92 return base::WrapUnique(new ui::test::TestIMEApplication); | 93 return base::WrapUnique(new ui::test::TestIMEApplication); |
| 93 #if defined(OS_LINUX) | 94 #if defined(OS_LINUX) |
| 94 if (name == "font_service") | 95 if (name == "font_service") |
| 95 return base::WrapUnique(new font_service::FontServiceApp); | 96 return base::WrapUnique(new font_service::FontServiceApp); |
| 96 #endif | 97 #endif |
| 97 return nullptr; | 98 return nullptr; |
| 98 } | 99 } |
| 99 | 100 |
| 100 } // namespace mash | 101 } // namespace mash |
| OLD | NEW |