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/wm/window_manager_application.h" | 5 #include "mash/wm/window_manager_application.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "components/mus/common/util.h" | 11 #include "components/mus/common/util.h" |
12 #include "components/mus/public/cpp/event_matcher.h" | 12 #include "components/mus/public/cpp/event_matcher.h" |
13 #include "components/mus/public/cpp/window.h" | 13 #include "components/mus/public/cpp/window.h" |
14 #include "components/mus/public/cpp/window_tree_connection.h" | 14 #include "components/mus/public/cpp/window_tree_connection.h" |
15 #include "components/mus/public/cpp/window_tree_host_factory.h" | 15 #include "components/mus/public/cpp/window_tree_host_factory.h" |
16 #include "mash/wm/accelerator_registrar_impl.h" | 16 #include "mash/wm/accelerator_registrar_impl.h" |
17 #include "mash/wm/background_layout.h" | 17 #include "mash/wm/background_layout.h" |
18 #include "mash/wm/shadow_controller.h" | 18 #include "mash/wm/shadow_controller.h" |
19 #include "mash/wm/shelf_layout.h" | 19 #include "mash/wm/shelf_layout.h" |
20 #include "mash/wm/window_layout.h" | 20 #include "mash/wm/window_layout.h" |
21 #include "mash/wm/window_manager_impl.h" | 21 #include "mash/wm/window_manager_impl.h" |
22 #include "mojo/application/public/cpp/application_connection.h" | |
23 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 22 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 23 #include "mojo/shell/public/cpp/application_connection.h" |
24 #include "ui/mojo/init/ui_init.h" | 24 #include "ui/mojo/init/ui_init.h" |
25 #include "ui/views/mus/aura_init.h" | 25 #include "ui/views/mus/aura_init.h" |
26 #include "ui/views/mus/display_converter.h" | 26 #include "ui/views/mus/display_converter.h" |
27 | 27 |
28 namespace mash { | 28 namespace mash { |
29 namespace wm { | 29 namespace wm { |
30 namespace { | 30 namespace { |
31 const uint32_t kWindowSwitchCmd = 1; | 31 const uint32_t kWindowSwitchCmd = 1; |
32 | 32 |
33 void AssertTrue(bool success) { | 33 void AssertTrue(bool success) { |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 DCHECK_EQ(mus::LoWord(window->id()), container) | 195 DCHECK_EQ(mus::LoWord(window->id()), container) |
196 << "Containers must be created before other windows!"; | 196 << "Containers must be created before other windows!"; |
197 window->SetBounds(root_->bounds()); | 197 window->SetBounds(root_->bounds()); |
198 window->SetVisible(true); | 198 window->SetVisible(true); |
199 root_->AddChild(window); | 199 root_->AddChild(window); |
200 } | 200 } |
201 } | 201 } |
202 | 202 |
203 } // namespace wm | 203 } // namespace wm |
204 } // namespace mash | 204 } // namespace mash |
OLD | NEW |