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/memory/ptr_util.h" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 switches::kWaitForDebugger); | 80 switches::kWaitForDebugger); |
81 if (!debugger_target.empty()) { | 81 if (!debugger_target.empty()) { |
82 if (name == debugger_target) { | 82 if (name == debugger_target) { |
83 LOG(WARNING) << "waiting for debugger to attach for service " << name | 83 LOG(WARNING) << "waiting for debugger to attach for service " << name |
84 << " pid=" << base::Process::Current().Pid(); | 84 << " pid=" << base::Process::Current().Pid(); |
85 base::debug::WaitForDebugger(120, true); | 85 base::debug::WaitForDebugger(120, true); |
86 } | 86 } |
87 } | 87 } |
88 | 88 |
89 #if defined(OS_CHROMEOS) | 89 #if defined(OS_CHROMEOS) |
90 if (name == ash::mojom::kServiceName) | 90 if (name == ash::mojom::kServiceName) { |
91 return base::WrapUnique(new ash::mus::WindowManagerApplication); | 91 const bool show_primary_host_on_connect = true; |
| 92 return base::WrapUnique( |
| 93 new ash::mus::WindowManagerApplication(show_primary_host_on_connect)); |
| 94 } |
92 if (name == "accessibility_autoclick") | 95 if (name == "accessibility_autoclick") |
93 return base::WrapUnique(new ash::autoclick::AutoclickApplication); | 96 return base::WrapUnique(new ash::autoclick::AutoclickApplication); |
94 if (name == "touch_hud") | 97 if (name == "touch_hud") |
95 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); | 98 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); |
96 #endif | 99 #endif |
97 if (name == catalog_viewer::mojom::kServiceName) | 100 if (name == catalog_viewer::mojom::kServiceName) |
98 return base::WrapUnique(new mash::catalog_viewer::CatalogViewer); | 101 return base::WrapUnique(new mash::catalog_viewer::CatalogViewer); |
99 if (name == session::mojom::kServiceName) | 102 if (name == session::mojom::kServiceName) |
100 return base::WrapUnique(new mash::session::Session); | 103 return base::WrapUnique(new mash::session::Session); |
101 if (name == ui::mojom::kServiceName) | 104 if (name == ui::mojom::kServiceName) |
102 return base::WrapUnique(new ui::Service); | 105 return base::WrapUnique(new ui::Service); |
103 if (name == quick_launch::mojom::kServiceName) | 106 if (name == quick_launch::mojom::kServiceName) |
104 return base::WrapUnique(new mash::quick_launch::QuickLaunch); | 107 return base::WrapUnique(new mash::quick_launch::QuickLaunch); |
105 if (name == task_viewer::mojom::kServiceName) | 108 if (name == task_viewer::mojom::kServiceName) |
106 return base::WrapUnique(new mash::task_viewer::TaskViewer); | 109 return base::WrapUnique(new mash::task_viewer::TaskViewer); |
107 if (name == "test_ime_driver") | 110 if (name == "test_ime_driver") |
108 return base::WrapUnique(new ui::test::TestIMEApplication); | 111 return base::WrapUnique(new ui::test::TestIMEApplication); |
109 #if defined(OS_LINUX) | 112 #if defined(OS_LINUX) |
110 if (name == "font_service") | 113 if (name == "font_service") |
111 return base::WrapUnique(new font_service::FontServiceApp); | 114 return base::WrapUnique(new font_service::FontServiceApp); |
112 #endif | 115 #endif |
113 return nullptr; | 116 return nullptr; |
114 } | 117 } |
115 | 118 |
116 } // namespace mash | 119 } // namespace mash |
OLD | NEW |