Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1654)

Side by Side Diff: chrome/app/mash/embedded_services.cc

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Removing debug include. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | chrome/browser/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
39 if (service_name == "accessibility_autoclick") 39 if (service_name == "accessibility_autoclick")
40 return base::MakeUnique<ash::autoclick::AutoclickApplication>(); 40 return base::MakeUnique<ash::autoclick::AutoclickApplication>();
41 if (service_name == "touch_hud") 41 if (service_name == "touch_hud")
42 return base::MakeUnique<ash::touch_hud::TouchHudApplication>(); 42 return base::MakeUnique<ash::touch_hud::TouchHudApplication>();
43 #endif // defined(OS_CHROMEOS) 43 #endif // defined(OS_CHROMEOS)
44 if (service_name == mash::catalog_viewer::mojom::kServiceName) 44 if (service_name == mash::catalog_viewer::mojom::kServiceName)
45 return base::MakeUnique<mash::catalog_viewer::CatalogViewer>(); 45 return base::MakeUnique<mash::catalog_viewer::CatalogViewer>();
46 if (service_name == mash::session::mojom::kServiceName) 46 if (service_name == mash::session::mojom::kServiceName)
47 return base::MakeUnique<mash::session::Session>(); 47 return base::MakeUnique<mash::session::Session>();
48 if (service_name == ui::mojom::kServiceName) 48 if (service_name == ui::mojom::kServiceName)
49 return base::MakeUnique<ui::Service>(); 49 return base::MakeUnique<ui::Service>(nullptr);
50 if (service_name == mash::quick_launch::mojom::kServiceName) 50 if (service_name == mash::quick_launch::mojom::kServiceName)
51 return base::MakeUnique<mash::quick_launch::QuickLaunch>(); 51 return base::MakeUnique<mash::quick_launch::QuickLaunch>();
52 if (service_name == mash::task_viewer::mojom::kServiceName) 52 if (service_name == mash::task_viewer::mojom::kServiceName)
53 return base::MakeUnique<mash::task_viewer::TaskViewer>(); 53 return base::MakeUnique<mash::task_viewer::TaskViewer>();
54 if (service_name == "test_ime_driver") 54 if (service_name == "test_ime_driver")
55 return base::MakeUnique<ui::test::TestIMEApplication>(); 55 return base::MakeUnique<ui::test::TestIMEApplication>();
56 #if defined(OS_LINUX) && !defined(OS_ANDROID) 56 #if defined(OS_LINUX) && !defined(OS_ANDROID)
57 if (service_name == "font_service") 57 if (service_name == "font_service")
58 return base::MakeUnique<font_service::FontServiceApp>(); 58 return base::MakeUnique<font_service::FontServiceApp>();
59 #endif // defined(OS_LINUX) && !defined(OS_ANDROID) 59 #endif // defined(OS_LINUX) && !defined(OS_ANDROID)
60 60
61 return nullptr; 61 return nullptr;
62 } 62 }
OLDNEW
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | chrome/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698