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 "chrome/browser/chromeos/chrome_interface_factory.h" | 5 #include "chrome/browser/chromeos/chrome_interface_factory.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "ash/common/mojo_interface_factory.h" | 9 #include "ash/common/mojo_interface_factory.h" |
10 #include "ash/public/interfaces/wallpaper.mojom.h" | 10 #include "ash/public/interfaces/wallpaper.mojom.h" |
11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
13 #include "base/threading/thread_checker.h" | 13 #include "base/threading/thread_checker.h" |
14 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/profiles/profile_manager.h" | 16 #include "chrome/browser/profiles/profile_manager.h" |
17 #include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h" | 17 #include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h" |
18 #include "chrome/browser/ui/ash/ash_util.h" | 18 #include "chrome/browser/ui/ash/ash_util.h" |
19 #include "chrome/browser/ui/ash/chrome_wallpaper_manager.h" | 19 #include "chrome/browser/ui/ash/chrome_wallpaper_manager.h" |
20 #include "chrome/browser/ui/ash/keyboard_ui_service.h" | 20 #include "chrome/browser/ui/ash/keyboard_ui_service.h" |
21 #include "chrome/browser/ui/ash/system_tray_client.h" | 21 #include "chrome/browser/ui/ash/system_tray_client.h" |
22 #include "chrome/browser/ui/browser_commands.h" | 22 #include "chrome/browser/ui/browser_commands.h" |
23 #include "chrome/browser/ui/browser_finder.h" | 23 #include "chrome/browser/ui/browser_finder.h" |
24 #include "content/public/common/service_manager_connection.h" | 24 #include "content/public/common/service_manager_connection.h" |
25 #include "mash/public/interfaces/launchable.mojom.h" | 25 #include "mash/public/interfaces/launchable.mojom.h" |
26 #include "mojo/public/cpp/bindings/binding_set.h" | 26 #include "mojo/public/cpp/bindings/binding_set.h" |
27 #include "services/shell/public/cpp/connection.h" | 27 #include "services/service_manager/public/cpp/connection.h" |
28 #include "services/shell/public/cpp/interface_registry.h" | 28 #include "services/service_manager/public/cpp/interface_registry.h" |
29 #include "ui/app_list/presenter/app_list_presenter.mojom.h" | 29 #include "ui/app_list/presenter/app_list_presenter.mojom.h" |
30 #include "ui/keyboard/keyboard.mojom.h" | 30 #include "ui/keyboard/keyboard.mojom.h" |
31 | 31 |
32 namespace chromeos { | 32 namespace chromeos { |
33 | 33 |
34 namespace { | 34 namespace { |
35 | 35 |
36 class ChromeLaunchable : public mash::mojom::Launchable { | 36 class ChromeLaunchable : public mash::mojom::Launchable { |
37 public: | 37 public: |
38 ChromeLaunchable() {} | 38 ChromeLaunchable() {} |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 // In classic ash, the browser process provides ash services to itself. | 175 // In classic ash, the browser process provides ash services to itself. |
176 if (!chrome::IsRunningInMash()) { | 176 if (!chrome::IsRunningInMash()) { |
177 ash::mojo_interface_factory::RegisterInterfaces(registry, | 177 ash::mojo_interface_factory::RegisterInterfaces(registry, |
178 main_thread_task_runner_); | 178 main_thread_task_runner_); |
179 } | 179 } |
180 | 180 |
181 return true; | 181 return true; |
182 } | 182 } |
183 | 183 |
184 } // namespace chromeos | 184 } // namespace chromeos |
OLD | NEW |