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

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

Issue 2435153004: Change Service contract to pass ServiceInfo instead of Identity (Closed)
Patch Set: . Created 4 years, 1 month 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/mash_packaged_service.h ('k') | mash/quick_launch/quick_launch.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/autoclick/mus/autoclick_application.h" 7 #include "ash/autoclick/mus/autoclick_application.h"
8 #include "ash/mus/window_manager_application.h" 8 #include "ash/mus/window_manager_application.h"
9 #include "ash/touch_hud/mus/touch_hud_application.h" 9 #include "ash/touch_hud/mus/touch_hud_application.h"
10 #include "mash/app_driver/app_driver.h" 10 #include "mash/app_driver/app_driver.h"
11 #include "mash/quick_launch/quick_launch.h" 11 #include "mash/quick_launch/quick_launch.h"
12 #include "mash/session/session.h" 12 #include "mash/session/session.h"
13 #include "mash/task_viewer/task_viewer.h" 13 #include "mash/task_viewer/task_viewer.h"
14 #include "services/service_manager/public/cpp/service_context.h" 14 #include "services/service_manager/public/cpp/service_context.h"
15 #include "services/ui/ime/test_ime_driver/test_ime_application.h" 15 #include "services/ui/ime/test_ime_driver/test_ime_application.h"
16 #include "services/ui/service.h" 16 #include "services/ui/service.h"
17 17
18 #if defined(OS_LINUX) 18 #if defined(OS_LINUX)
19 #include "components/font_service/font_service_app.h" 19 #include "components/font_service/font_service_app.h"
20 #endif 20 #endif
21 21
22 namespace mash { 22 namespace mash {
23 23
24 MashPackagedService::MashPackagedService() {} 24 MashPackagedService::MashPackagedService() {}
25 25
26 MashPackagedService::~MashPackagedService() {} 26 MashPackagedService::~MashPackagedService() {}
27 27
28 bool MashPackagedService::OnConnect( 28 bool MashPackagedService::OnConnect(
29 const service_manager::Identity& remote_identity, 29 const service_manager::ServiceInfo& remote_info,
30 service_manager::InterfaceRegistry* registry) { 30 service_manager::InterfaceRegistry* registry) {
31 registry->AddInterface<ServiceFactory>(this); 31 registry->AddInterface<ServiceFactory>(this);
32 return true; 32 return true;
33 } 33 }
34 34
35 void MashPackagedService::Create( 35 void MashPackagedService::Create(
36 const service_manager::Identity& remote_identity, 36 const service_manager::Identity& remote_identity,
37 mojo::InterfaceRequest<ServiceFactory> request) { 37 mojo::InterfaceRequest<ServiceFactory> request) {
38 service_factory_bindings_.AddBinding(this, std::move(request)); 38 service_factory_bindings_.AddBinding(this, std::move(request));
39 } 39 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #if defined(OS_LINUX) 77 #if defined(OS_LINUX)
78 if (name == "service:font_service") 78 if (name == "service:font_service")
79 return base::WrapUnique(new font_service::FontServiceApp); 79 return base::WrapUnique(new font_service::FontServiceApp);
80 #endif 80 #endif
81 if (name == "service:app_driver") 81 if (name == "service:app_driver")
82 return base::WrapUnique(new mash::app_driver::AppDriver); 82 return base::WrapUnique(new mash::app_driver::AppDriver);
83 return nullptr; 83 return nullptr;
84 } 84 }
85 85
86 } // namespace mash 86 } // namespace mash
OLDNEW
« no previous file with comments | « mash/package/mash_packaged_service.h ('k') | mash/quick_launch/quick_launch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698