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

Side by Side Diff: mash/package/mash_packaged_service.cc

Issue 2620503002: nogncheck some includes guarded under OS_CHROMEOS (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "base/process/process.h" 11 #include "base/process/process.h"
12 #include "mash/catalog_viewer/catalog_viewer.h" 12 #include "mash/catalog_viewer/catalog_viewer.h"
13 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h" 13 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h"
14 #include "mash/quick_launch/public/interfaces/constants.mojom.h" 14 #include "mash/quick_launch/public/interfaces/constants.mojom.h"
15 #include "mash/quick_launch/quick_launch.h" 15 #include "mash/quick_launch/quick_launch.h"
16 #include "mash/session/public/interfaces/constants.mojom.h" 16 #include "mash/session/public/interfaces/constants.mojom.h"
17 #include "mash/session/session.h" 17 #include "mash/session/session.h"
18 #include "mash/task_viewer/public/interfaces/constants.mojom.h" 18 #include "mash/task_viewer/public/interfaces/constants.mojom.h"
19 #include "mash/task_viewer/task_viewer.h" 19 #include "mash/task_viewer/task_viewer.h"
20 #include "services/service_manager/public/cpp/interface_registry.h" 20 #include "services/service_manager/public/cpp/interface_registry.h"
21 #include "services/service_manager/public/cpp/service_context.h" 21 #include "services/service_manager/public/cpp/service_context.h"
22 #include "services/ui/ime/test_ime_driver/test_ime_application.h" 22 #include "services/ui/ime/test_ime_driver/test_ime_application.h"
23 #include "services/ui/public/interfaces/constants.mojom.h" 23 #include "services/ui/public/interfaces/constants.mojom.h"
24 #include "services/ui/service.h" 24 #include "services/ui/service.h"
25 25
26 #if defined(OS_CHROMEOS) 26 #if defined(OS_CHROMEOS)
27 #include "ash/autoclick/mus/autoclick_application.h" 27 #include "ash/autoclick/mus/autoclick_application.h" // nogncheck
28 #include "ash/mus/window_manager_application.h" 28 #include "ash/mus/window_manager_application.h" // nogncheck
29 #include "ash/touch_hud/mus/touch_hud_application.h" 29 #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck
30 #endif 30 #endif
31 31
32 #if defined(OS_LINUX) 32 #if defined(OS_LINUX)
33 #include "components/font_service/font_service_app.h" 33 #include "components/font_service/font_service_app.h"
34 #endif 34 #endif
35 35
36 namespace mash { 36 namespace mash {
37 37
38 MashPackagedService::MashPackagedService() {} 38 MashPackagedService::MashPackagedService() {}
39 39
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 if (name == "test_ime_driver") 104 if (name == "test_ime_driver")
105 return base::WrapUnique(new ui::test::TestIMEApplication); 105 return base::WrapUnique(new ui::test::TestIMEApplication);
106 #if defined(OS_LINUX) 106 #if defined(OS_LINUX)
107 if (name == "font_service") 107 if (name == "font_service")
108 return base::WrapUnique(new font_service::FontServiceApp); 108 return base::WrapUnique(new font_service::FontServiceApp);
109 #endif 109 #endif
110 return nullptr; 110 return nullptr;
111 } 111 }
112 112
113 } // namespace mash 113 } // namespace mash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698