OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/app_driver/app_driver.h" | 5 #include "mash/app_driver/app_driver.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "mash/public/interfaces/launchable.mojom.h" | 11 #include "mash/public/interfaces/launchable.mojom.h" |
12 #include "services/shell/public/cpp/connection.h" | 12 #include "services/service_manager/public/cpp/connection.h" |
13 #include "services/shell/public/cpp/connector.h" | 13 #include "services/service_manager/public/cpp/connector.h" |
14 #include "services/ui/common/event_matcher_util.h" | 14 #include "services/ui/common/event_matcher_util.h" |
15 | 15 |
16 using mash::mojom::LaunchablePtr; | 16 using mash::mojom::LaunchablePtr; |
17 using mash::mojom::LaunchMode; | 17 using mash::mojom::LaunchMode; |
18 | 18 |
19 namespace mash { | 19 namespace mash { |
20 namespace app_driver { | 20 namespace app_driver { |
21 namespace { | 21 namespace { |
22 | 22 |
23 const char kBrowserServiceName[] = "service:content_browser"; | 23 const char kBrowserServiceName[] = "service:content_browser"; |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 | 130 |
131 void AppDriver::AddAccelerators() { | 131 void AppDriver::AddAccelerators() { |
132 connector()->ConnectToInterface("service:catalog", &catalog_); | 132 connector()->ConnectToInterface("service:catalog", &catalog_); |
133 catalog_->GetEntriesProvidingClass( | 133 catalog_->GetEntriesProvidingClass( |
134 "mus:window_manager", base::Bind(&AppDriver::OnAvailableCatalogEntries, | 134 "mus:window_manager", base::Bind(&AppDriver::OnAvailableCatalogEntries, |
135 weak_factory_.GetWeakPtr())); | 135 weak_factory_.GetWeakPtr())); |
136 } | 136 } |
137 | 137 |
138 } // namespace app_driver | 138 } // namespace app_driver |
139 } // namespace mash | 139 } // namespace mash |
OLD | NEW |