OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/mus/public/cpp/lib/window_tree_client_impl.h" | 5 #include "components/mus/public/cpp/lib/window_tree_client_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.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/input_event_handler.h" | 12 #include "components/mus/public/cpp/input_event_handler.h" |
13 #include "components/mus/public/cpp/lib/in_flight_change.h" | 13 #include "components/mus/public/cpp/lib/in_flight_change.h" |
14 #include "components/mus/public/cpp/lib/window_private.h" | 14 #include "components/mus/public/cpp/lib/window_private.h" |
15 #include "components/mus/public/cpp/window_manager_delegate.h" | 15 #include "components/mus/public/cpp/window_manager_delegate.h" |
16 #include "components/mus/public/cpp/window_observer.h" | 16 #include "components/mus/public/cpp/window_observer.h" |
17 #include "components/mus/public/cpp/window_tree_connection.h" | 17 #include "components/mus/public/cpp/window_tree_connection.h" |
18 #include "components/mus/public/cpp/window_tree_connection_observer.h" | 18 #include "components/mus/public/cpp/window_tree_connection_observer.h" |
19 #include "components/mus/public/cpp/window_tree_delegate.h" | 19 #include "components/mus/public/cpp/window_tree_delegate.h" |
20 #include "mojo/application/public/cpp/application_impl.h" | |
21 #include "mojo/application/public/cpp/connect.h" | |
22 #include "mojo/application/public/cpp/service_provider_impl.h" | |
23 #include "mojo/application/public/interfaces/service_provider.mojom.h" | |
24 #include "mojo/converters/geometry/geometry_type_converters.h" | 20 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 21 #include "mojo/shell/public/cpp/application_impl.h" |
| 22 #include "mojo/shell/public/cpp/connect.h" |
| 23 #include "mojo/shell/public/cpp/service_provider_impl.h" |
| 24 #include "mojo/shell/public/interfaces/service_provider.mojom.h" |
25 #include "ui/gfx/geometry/insets.h" | 25 #include "ui/gfx/geometry/insets.h" |
26 #include "ui/gfx/geometry/size.h" | 26 #include "ui/gfx/geometry/size.h" |
27 | 27 |
28 namespace mus { | 28 namespace mus { |
29 | 29 |
30 Id MakeTransportId(ConnectionSpecificId connection_id, | 30 Id MakeTransportId(ConnectionSpecificId connection_id, |
31 ConnectionSpecificId local_id) { | 31 ConnectionSpecificId local_id) { |
32 return (connection_id << 16) | local_id; | 32 return (connection_id << 16) | local_id; |
33 } | 33 } |
34 | 34 |
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
854 mojo::Map<mojo::String, mojo::Array<uint8_t>> transport_properties) { | 854 mojo::Map<mojo::String, mojo::Array<uint8_t>> transport_properties) { |
855 std::map<std::string, std::vector<uint8_t>> properties = | 855 std::map<std::string, std::vector<uint8_t>> properties = |
856 transport_properties.To<std::map<std::string, std::vector<uint8_t>>>(); | 856 transport_properties.To<std::map<std::string, std::vector<uint8_t>>>(); |
857 Window* window = | 857 Window* window = |
858 window_manager_delegate_->OnWmCreateTopLevelWindow(&properties); | 858 window_manager_delegate_->OnWmCreateTopLevelWindow(&properties); |
859 window_manager_internal_client_->OnWmCreatedTopLevelWindow(change_id, | 859 window_manager_internal_client_->OnWmCreatedTopLevelWindow(change_id, |
860 window->id()); | 860 window->id()); |
861 } | 861 } |
862 | 862 |
863 } // namespace mus | 863 } // namespace mus |
OLD | NEW |