| 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 "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/debugger.h" | 9 #include "base/debug/debugger.h" |
| 10 #include "base/memory/ptr_util.h" |
| 10 #include "base/process/process.h" | 11 #include "base/process/process.h" |
| 11 #include "mash/catalog_viewer/catalog_viewer.h" | 12 #include "mash/catalog_viewer/catalog_viewer.h" |
| 12 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h" | 13 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h" |
| 13 #include "mash/quick_launch/public/interfaces/constants.mojom.h" | 14 #include "mash/quick_launch/public/interfaces/constants.mojom.h" |
| 14 #include "mash/quick_launch/quick_launch.h" | 15 #include "mash/quick_launch/quick_launch.h" |
| 15 #include "mash/session/public/interfaces/constants.mojom.h" | 16 #include "mash/session/public/interfaces/constants.mojom.h" |
| 16 #include "mash/session/session.h" | 17 #include "mash/session/session.h" |
| 17 #include "mash/task_viewer/public/interfaces/constants.mojom.h" | 18 #include "mash/task_viewer/public/interfaces/constants.mojom.h" |
| 18 #include "mash/task_viewer/task_viewer.h" | 19 #include "mash/task_viewer/task_viewer.h" |
| 19 #include "services/service_manager/public/cpp/interface_registry.h" | 20 #include "services/service_manager/public/cpp/interface_registry.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 if (name == "test_ime_driver") | 104 if (name == "test_ime_driver") |
| 104 return base::WrapUnique(new ui::test::TestIMEApplication); | 105 return base::WrapUnique(new ui::test::TestIMEApplication); |
| 105 #if defined(OS_LINUX) | 106 #if defined(OS_LINUX) |
| 106 if (name == "font_service") | 107 if (name == "font_service") |
| 107 return base::WrapUnique(new font_service::FontServiceApp); | 108 return base::WrapUnique(new font_service::FontServiceApp); |
| 108 #endif | 109 #endif |
| 109 return nullptr; | 110 return nullptr; |
| 110 } | 111 } |
| 111 | 112 |
| 112 } // namespace mash | 113 } // namespace mash |
| OLD | NEW |