| 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 "mash/catalog_viewer/catalog_viewer.h" |
| 10 #include "mash/quick_launch/quick_launch.h" | 11 #include "mash/quick_launch/quick_launch.h" |
| 11 #include "mash/session/session.h" | 12 #include "mash/session/session.h" |
| 12 #include "mash/task_viewer/task_viewer.h" | 13 #include "mash/task_viewer/task_viewer.h" |
| 13 #include "services/service_manager/public/cpp/service_context.h" | 14 #include "services/service_manager/public/cpp/service_context.h" |
| 14 #include "services/ui/ime/test_ime_driver/test_ime_application.h" | 15 #include "services/ui/ime/test_ime_driver/test_ime_application.h" |
| 15 #include "services/ui/service.h" | 16 #include "services/ui/service.h" |
| 16 | 17 |
| 17 #if defined(OS_LINUX) | 18 #if defined(OS_LINUX) |
| 18 #include "components/font_service/font_service_app.h" | 19 #include "components/font_service/font_service_app.h" |
| 19 #endif | 20 #endif |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 NOTREACHED(); | 55 NOTREACHED(); |
| 55 } | 56 } |
| 56 | 57 |
| 57 // Please see header file for details on adding new services. | 58 // Please see header file for details on adding new services. |
| 58 std::unique_ptr<service_manager::Service> MashPackagedService::CreateService( | 59 std::unique_ptr<service_manager::Service> MashPackagedService::CreateService( |
| 59 const std::string& name) { | 60 const std::string& name) { |
| 60 if (name == "service:ash") | 61 if (name == "service:ash") |
| 61 return base::WrapUnique(new ash::mus::WindowManagerApplication); | 62 return base::WrapUnique(new ash::mus::WindowManagerApplication); |
| 62 if (name == "service:accessibility_autoclick") | 63 if (name == "service:accessibility_autoclick") |
| 63 return base::WrapUnique(new ash::autoclick::AutoclickApplication); | 64 return base::WrapUnique(new ash::autoclick::AutoclickApplication); |
| 65 if (name == "service:catalog_viewer") |
| 66 return base::WrapUnique(new mash::catalog_viewer::CatalogViewer); |
| 64 if (name == "service:touch_hud") | 67 if (name == "service:touch_hud") |
| 65 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); | 68 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); |
| 66 if (name == "service:mash_session") | 69 if (name == "service:mash_session") |
| 67 return base::WrapUnique(new mash::session::Session); | 70 return base::WrapUnique(new mash::session::Session); |
| 68 if (name == "service:ui") | 71 if (name == "service:ui") |
| 69 return base::WrapUnique(new ui::Service); | 72 return base::WrapUnique(new ui::Service); |
| 70 if (name == "service:quick_launch") | 73 if (name == "service:quick_launch") |
| 71 return base::WrapUnique(new mash::quick_launch::QuickLaunch); | 74 return base::WrapUnique(new mash::quick_launch::QuickLaunch); |
| 72 if (name == "service:task_viewer") | 75 if (name == "service:task_viewer") |
| 73 return base::WrapUnique(new mash::task_viewer::TaskViewer); | 76 return base::WrapUnique(new mash::task_viewer::TaskViewer); |
| 74 if (name == "service:test_ime_driver") | 77 if (name == "service:test_ime_driver") |
| 75 return base::WrapUnique(new ui::test::TestIMEApplication); | 78 return base::WrapUnique(new ui::test::TestIMEApplication); |
| 76 #if defined(OS_LINUX) | 79 #if defined(OS_LINUX) |
| 77 if (name == "service:font_service") | 80 if (name == "service:font_service") |
| 78 return base::WrapUnique(new font_service::FontServiceApp); | 81 return base::WrapUnique(new font_service::FontServiceApp); |
| 79 #endif | 82 #endif |
| 80 return nullptr; | 83 return nullptr; |
| 81 } | 84 } |
| 82 | 85 |
| 83 } // namespace mash | 86 } // namespace mash |
| OLD | NEW |