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/root_window_controller.h" | 5 #include "ash/mus/root_window_controller.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <sstream> | 10 #include <sstream> |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "ash/mus/bridge/wm_root_window_controller_mus.h" | 21 #include "ash/mus/bridge/wm_root_window_controller_mus.h" |
22 #include "ash/mus/bridge/wm_shelf_mus.h" | 22 #include "ash/mus/bridge/wm_shelf_mus.h" |
23 #include "ash/mus/bridge/wm_shell_mus.h" | 23 #include "ash/mus/bridge/wm_shell_mus.h" |
24 #include "ash/mus/bridge/wm_window_mus.h" | 24 #include "ash/mus/bridge/wm_window_mus.h" |
25 #include "ash/mus/container_ids.h" | 25 #include "ash/mus/container_ids.h" |
26 #include "ash/mus/non_client_frame_controller.h" | 26 #include "ash/mus/non_client_frame_controller.h" |
27 #include "ash/mus/property_util.h" | 27 #include "ash/mus/property_util.h" |
28 #include "ash/mus/screenlock_layout.h" | 28 #include "ash/mus/screenlock_layout.h" |
29 #include "ash/mus/shelf_layout_manager.h" | 29 #include "ash/mus/shelf_layout_manager.h" |
30 #include "ash/mus/status_layout_manager.h" | 30 #include "ash/mus/status_layout_manager.h" |
| 31 #include "ash/mus/touch_hud_layout.h" |
31 #include "ash/mus/window_manager.h" | 32 #include "ash/mus/window_manager.h" |
32 #include "base/bind.h" | 33 #include "base/bind.h" |
33 #include "base/command_line.h" | 34 #include "base/command_line.h" |
34 #include "base/memory/ptr_util.h" | 35 #include "base/memory/ptr_util.h" |
35 #include "mojo/public/cpp/bindings/type_converter.h" | 36 #include "mojo/public/cpp/bindings/type_converter.h" |
36 #include "services/shell/public/cpp/connector.h" | 37 #include "services/shell/public/cpp/connector.h" |
37 #include "services/ui/common/switches.h" | 38 #include "services/ui/common/switches.h" |
38 #include "services/ui/common/util.h" | 39 #include "services/ui/common/util.h" |
39 #include "services/ui/public/cpp/property_type_converters.h" | 40 #include "services/ui/public/cpp/property_type_converters.h" |
40 #include "services/ui/public/cpp/window.h" | 41 #include "services/ui/public/cpp/window.h" |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 | 251 |
251 WmWindowMus* docked_container = | 252 WmWindowMus* docked_container = |
252 GetWindowByShellWindowId(kShellWindowId_DockedContainer); | 253 GetWindowByShellWindowId(kShellWindowId_DockedContainer); |
253 docked_container->SetLayoutManager( | 254 docked_container->SetLayoutManager( |
254 base::WrapUnique(new DockedWindowLayoutManager(docked_container))); | 255 base::WrapUnique(new DockedWindowLayoutManager(docked_container))); |
255 | 256 |
256 WmWindowMus* panel_container = | 257 WmWindowMus* panel_container = |
257 GetWindowByShellWindowId(kShellWindowId_PanelContainer); | 258 GetWindowByShellWindowId(kShellWindowId_PanelContainer); |
258 panel_container->SetLayoutManager( | 259 panel_container->SetLayoutManager( |
259 base::WrapUnique(new PanelLayoutManager(panel_container))); | 260 base::WrapUnique(new PanelLayoutManager(panel_container))); |
| 261 |
| 262 WmWindowMus* touch_hud_container = |
| 263 GetWindowByShellWindowId(kShellWindowId_OverlayContainer); |
| 264 layout_managers_[touch_hud_container->mus_window()].reset( |
| 265 new TouchHudLayout(touch_hud_container->mus_window())); |
260 } | 266 } |
261 | 267 |
262 } // namespace mus | 268 } // namespace mus |
263 } // namespace ash | 269 } // namespace ash |
OLD | NEW |