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 "ash/mus/sysui_application.h" | 5 #include "ash/mus/sysui_application.h" |
6 | 6 |
7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
8 #include "ash/host/ash_window_tree_host_init_params.h" | 8 #include "ash/host/ash_window_tree_host_init_params.h" |
9 #include "ash/host/ash_window_tree_host_platform.h" | 9 #include "ash/host/ash_window_tree_host_platform.h" |
10 #include "ash/mus/keyboard_ui_mus.h" | 10 #include "ash/mus/keyboard_ui_mus.h" |
11 #include "ash/mus/shell_delegate_mus.h" | 11 #include "ash/mus/shell_delegate_mus.h" |
12 #include "ash/mus/stub_context_factory.h" | 12 #include "ash/mus/stub_context_factory.h" |
13 #include "ash/root_window_settings.h" | 13 #include "ash/root_window_settings.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "ash/shell_init_params.h" | 15 #include "ash/shell_init_params.h" |
16 #include "ash/shell_window_ids.h" | 16 #include "ash/shell_window_ids.h" |
17 #include "base/bind.h" | 17 #include "base/bind.h" |
18 #include "base/files/file_path.h" | 18 #include "base/files/file_path.h" |
| 19 #include "base/message_loop/message_loop.h" |
19 #include "base/path_service.h" | 20 #include "base/path_service.h" |
20 #include "base/threading/sequenced_worker_pool.h" | 21 #include "base/threading/sequenced_worker_pool.h" |
21 #include "components/mus/public/cpp/property_type_converters.h" | 22 #include "components/mus/public/cpp/property_type_converters.h" |
22 #include "mash/wm/public/interfaces/ash_window_type.mojom.h" | 23 #include "mash/wm/public/interfaces/ash_window_type.mojom.h" |
23 #include "mash/wm/public/interfaces/container.mojom.h" | 24 #include "mash/wm/public/interfaces/container.mojom.h" |
24 #include "ui/aura/env.h" | 25 #include "ui/aura/env.h" |
25 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
26 #include "ui/base/ui_base_paths.h" | 27 #include "ui/base/ui_base_paths.h" |
27 #include "ui/message_center/message_center.h" | 28 #include "ui/message_center/message_center.h" |
28 #include "ui/platform_window/stub/stub_window.h" | 29 #include "ui/platform_window/stub/stub_window.h" |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 const mojo::Identity& identity, | 282 const mojo::Identity& identity, |
282 uint32_t id) { | 283 uint32_t id) { |
283 ash_init_.reset(new AshInit()); | 284 ash_init_.reset(new AshInit()); |
284 ash_init_->Initialize(connector); | 285 ash_init_->Initialize(connector); |
285 } | 286 } |
286 | 287 |
287 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) { | 288 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) { |
288 return true; | 289 return true; |
289 } | 290 } |
290 | 291 |
| 292 void SysUIApplication::ShellConnectionLost() { |
| 293 base::MessageLoop::current()->QuitWhenIdle(); |
| 294 } |
| 295 |
291 } // namespace sysui | 296 } // namespace sysui |
292 } // namespace ash | 297 } // namespace ash |
OLD | NEW |