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_impl.h" | 5 #include "mash/wm/window_manager_impl.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "components/mus/common/types.h" | 10 #include "components/mus/common/types.h" |
11 #include "components/mus/public/cpp/property_type_converters.h" | 11 #include "components/mus/public/cpp/property_type_converters.h" |
12 #include "components/mus/public/cpp/window.h" | 12 #include "components/mus/public/cpp/window.h" |
13 #include "components/mus/public/cpp/window_property.h" | 13 #include "components/mus/public/cpp/window_property.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/interfaces/input_events.mojom.h" | 15 #include "components/mus/public/interfaces/input_events.mojom.h" |
16 #include "components/mus/public/interfaces/mus_constants.mojom.h" | 16 #include "components/mus/public/interfaces/mus_constants.mojom.h" |
17 #include "components/mus/public/interfaces/window_manager.mojom.h" | 17 #include "components/mus/public/interfaces/window_manager.mojom.h" |
18 #include "mash/wm/non_client_frame_controller.h" | 18 #include "mash/wm/non_client_frame_controller.h" |
19 #include "mash/wm/property_util.h" | 19 #include "mash/wm/property_util.h" |
20 #include "mash/wm/public/interfaces/container.mojom.h" | 20 #include "mash/wm/public/interfaces/container.mojom.h" |
21 #include "mash/wm/window_manager_application.h" | 21 #include "mash/wm/window_manager_application.h" |
22 #include "mojo/application/public/cpp/application_impl.h" | |
23 #include "mojo/converters/geometry/geometry_type_converters.h" | 22 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 23 #include "mojo/shell/public/cpp/application_impl.h" |
24 | 24 |
25 namespace mojo { | 25 namespace mojo { |
26 | 26 |
27 template <> | 27 template <> |
28 struct TypeConverter<const std::vector<uint8_t>, Array<uint8_t>> { | 28 struct TypeConverter<const std::vector<uint8_t>, Array<uint8_t>> { |
29 static const std::vector<uint8_t> Convert(const Array<uint8_t>& input) { | 29 static const std::vector<uint8_t> Convert(const Array<uint8_t>& input) { |
30 return input.storage(); | 30 return input.storage(); |
31 } | 31 } |
32 }; | 32 }; |
33 | 33 |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 name == mus::mojom::WindowManager::kWindowTitle_Property; | 184 name == mus::mojom::WindowManager::kWindowTitle_Property; |
185 } | 185 } |
186 | 186 |
187 mus::Window* WindowManagerImpl::OnWmCreateTopLevelWindow( | 187 mus::Window* WindowManagerImpl::OnWmCreateTopLevelWindow( |
188 std::map<std::string, std::vector<uint8_t>>* properties) { | 188 std::map<std::string, std::vector<uint8_t>>* properties) { |
189 return NewTopLevelWindow(properties, nullptr); | 189 return NewTopLevelWindow(properties, nullptr); |
190 } | 190 } |
191 | 191 |
192 } // namespace wm | 192 } // namespace wm |
193 } // namespace mash | 193 } // namespace mash |
OLD | NEW |