OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "chrome/app/mash/embedded_services.h" | 5 #include "chrome/app/mash/embedded_services.h" |
6 | 6 |
7 #include "mash/catalog_viewer/catalog_viewer.h" | 7 #include "mash/catalog_viewer/catalog_viewer.h" |
8 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h" | 8 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h" |
9 #include "mash/common/config.h" | 9 #include "mash/common/config.h" |
10 #include "mash/quick_launch/public/interfaces/constants.mojom.h" | 10 #include "mash/quick_launch/public/interfaces/constants.mojom.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck | 24 #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck |
25 #endif // defined(OS_CHROMEOS) | 25 #endif // defined(OS_CHROMEOS) |
26 | 26 |
27 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 27 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
28 #include "components/font_service/font_service_app.h" | 28 #include "components/font_service/font_service_app.h" |
29 #endif // defined(OS_LINUX) && !defined(OS_ANDROID) | 29 #endif // defined(OS_LINUX) && !defined(OS_ANDROID) |
30 | 30 |
31 std::unique_ptr<service_manager::Service> CreateEmbeddedMashService( | 31 std::unique_ptr<service_manager::Service> CreateEmbeddedMashService( |
32 const std::string& service_name) { | 32 const std::string& service_name) { |
33 #if defined(OS_CHROMEOS) | 33 #if defined(OS_CHROMEOS) |
34 if (service_name == ash::mojom::kServiceName) | 34 if (service_name == ash::mojom::kServiceName) { |
35 return base::MakeUnique<ash::mus::WindowManagerApplication>(); | 35 const bool show_primary_host_on_connect = true; |
| 36 return base::WrapUnique( |
| 37 new ash::mus::WindowManagerApplication(show_primary_host_on_connect)); |
| 38 } |
36 if (service_name == "accessibility_autoclick") | 39 if (service_name == "accessibility_autoclick") |
37 return base::MakeUnique<ash::autoclick::AutoclickApplication>(); | 40 return base::MakeUnique<ash::autoclick::AutoclickApplication>(); |
38 if (service_name == "touch_hud") | 41 if (service_name == "touch_hud") |
39 return base::MakeUnique<ash::touch_hud::TouchHudApplication>(); | 42 return base::MakeUnique<ash::touch_hud::TouchHudApplication>(); |
40 #endif // defined(OS_CHROMEOS) | 43 #endif // defined(OS_CHROMEOS) |
41 if (service_name == mash::catalog_viewer::mojom::kServiceName) | 44 if (service_name == mash::catalog_viewer::mojom::kServiceName) |
42 return base::MakeUnique<mash::catalog_viewer::CatalogViewer>(); | 45 return base::MakeUnique<mash::catalog_viewer::CatalogViewer>(); |
43 if (service_name == mash::session::mojom::kServiceName) | 46 if (service_name == mash::session::mojom::kServiceName) |
44 return base::MakeUnique<mash::session::Session>(); | 47 return base::MakeUnique<mash::session::Session>(); |
45 if (service_name == ui::mojom::kServiceName) | 48 if (service_name == ui::mojom::kServiceName) |
46 return base::MakeUnique<ui::Service>(); | 49 return base::MakeUnique<ui::Service>(); |
47 if (service_name == mash::quick_launch::mojom::kServiceName) | 50 if (service_name == mash::quick_launch::mojom::kServiceName) |
48 return base::MakeUnique<mash::quick_launch::QuickLaunch>(); | 51 return base::MakeUnique<mash::quick_launch::QuickLaunch>(); |
49 if (service_name == mash::task_viewer::mojom::kServiceName) | 52 if (service_name == mash::task_viewer::mojom::kServiceName) |
50 return base::MakeUnique<mash::task_viewer::TaskViewer>(); | 53 return base::MakeUnique<mash::task_viewer::TaskViewer>(); |
51 if (service_name == "test_ime_driver") | 54 if (service_name == "test_ime_driver") |
52 return base::MakeUnique<ui::test::TestIMEApplication>(); | 55 return base::MakeUnique<ui::test::TestIMEApplication>(); |
53 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 56 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
54 if (service_name == "font_service") | 57 if (service_name == "font_service") |
55 return base::MakeUnique<font_service::FontServiceApp>(); | 58 return base::MakeUnique<font_service::FontServiceApp>(); |
56 #endif // defined(OS_LINUX) && !defined(OS_ANDROID) | 59 #endif // defined(OS_LINUX) && !defined(OS_ANDROID) |
57 | 60 |
58 return nullptr; | 61 return nullptr; |
59 } | 62 } |
OLD | NEW |