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

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

Issue 2230393002: IME for Mus: Make InputMethodMus use the IME Mojo API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update mash_browser_tests_manifest. Created 4 years, 3 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 | « mash/package/DEPS ('k') | services/ui/ime/ime_server_impl.h » ('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 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 "ash/mus/window_manager_application.h" 7 #include "ash/mus/window_manager_application.h"
8 #include "ash/touch_hud/mus/touch_hud_application.h" 8 #include "ash/touch_hud/mus/touch_hud_application.h"
9 #include "mash/app_driver/app_driver.h" 9 #include "mash/app_driver/app_driver.h"
10 #include "mash/quick_launch/quick_launch.h" 10 #include "mash/quick_launch/quick_launch.h"
11 #include "mash/session/session.h" 11 #include "mash/session/session.h"
12 #include "mash/task_viewer/task_viewer.h" 12 #include "mash/task_viewer/task_viewer.h"
13 #include "services/shell/public/cpp/service_context.h" 13 #include "services/shell/public/cpp/service_context.h"
14 #include "services/ui/ime/test_ime_driver/test_ime_application.h"
14 #include "services/ui/service.h" 15 #include "services/ui/service.h"
15 16
16 #if defined(OS_LINUX) 17 #if defined(OS_LINUX)
17 #include "components/font_service/font_service_app.h" 18 #include "components/font_service/font_service_app.h"
18 #endif 19 #endif
19 20
20 namespace mash { 21 namespace mash {
21 22
22 MashPackagedService::MashPackagedService() {} 23 MashPackagedService::MashPackagedService() {}
23 24
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 if (name == "mojo:touch_hud") 59 if (name == "mojo:touch_hud")
59 return base::WrapUnique(new ash::touch_hud::TouchHudApplication); 60 return base::WrapUnique(new ash::touch_hud::TouchHudApplication);
60 if (name == "mojo:mash_session") 61 if (name == "mojo:mash_session")
61 return base::WrapUnique(new mash::session::Session); 62 return base::WrapUnique(new mash::session::Session);
62 if (name == "mojo:ui") 63 if (name == "mojo:ui")
63 return base::WrapUnique(new ui::Service); 64 return base::WrapUnique(new ui::Service);
64 if (name == "mojo:quick_launch") 65 if (name == "mojo:quick_launch")
65 return base::WrapUnique(new mash::quick_launch::QuickLaunch); 66 return base::WrapUnique(new mash::quick_launch::QuickLaunch);
66 if (name == "mojo:task_viewer") 67 if (name == "mojo:task_viewer")
67 return base::WrapUnique(new mash::task_viewer::TaskViewer); 68 return base::WrapUnique(new mash::task_viewer::TaskViewer);
69 if (name == "mojo:test_ime_driver")
70 return base::WrapUnique(new ui::test::TestIMEApplication);
68 #if defined(OS_LINUX) 71 #if defined(OS_LINUX)
69 if (name == "mojo:font_service") 72 if (name == "mojo:font_service")
70 return base::WrapUnique(new font_service::FontServiceApp); 73 return base::WrapUnique(new font_service::FontServiceApp);
71 #endif 74 #endif
72 if (name == "mojo:app_driver") 75 if (name == "mojo:app_driver")
73 return base::WrapUnique(new mash::app_driver::AppDriver); 76 return base::WrapUnique(new mash::app_driver::AppDriver);
74 return nullptr; 77 return nullptr;
75 } 78 }
76 79
77 } // namespace mash 80 } // namespace mash
OLDNEW
« no previous file with comments | « mash/package/DEPS ('k') | services/ui/ime/ime_server_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698