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 "ui/views/mus/window_manager_connection.h" | 5 #include "ui/views/mus/window_manager_connection.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/threading/thread_local.h" | 10 #include "base/threading/thread_local.h" |
11 #include "components/mus/public/cpp/window_tree_connection.h" | 11 #include "components/mus/public/cpp/window_tree_connection.h" |
12 #include "components/mus/public/interfaces/window_tree.mojom.h" | 12 #include "components/mus/public/interfaces/window_tree.mojom.h" |
13 #include "mojo/converters/geometry/geometry_type_converters.h" | 13 #include "mojo/converters/geometry/geometry_type_converters.h" |
14 #include "mojo/converters/network/network_type_converters.h" | 14 #include "mojo/converters/network/network_type_converters.h" |
15 #include "mojo/shell/public/cpp/application_connection.h" | 15 #include "mojo/shell/public/cpp/connection.h" |
16 #include "mojo/shell/public/cpp/shell.h" | 16 #include "mojo/shell/public/cpp/shell.h" |
17 #include "ui/views/mus/native_widget_mus.h" | 17 #include "ui/views/mus/native_widget_mus.h" |
18 #include "ui/views/mus/screen_mus.h" | 18 #include "ui/views/mus/screen_mus.h" |
19 #include "ui/views/views_delegate.h" | 19 #include "ui/views/views_delegate.h" |
20 | 20 |
21 namespace views { | 21 namespace views { |
22 namespace { | 22 namespace { |
23 | 23 |
24 using WindowManagerConnectionPtr = | 24 using WindowManagerConnectionPtr = |
25 base::ThreadLocalPointer<views::WindowManagerConnection>; | 25 base::ThreadLocalPointer<views::WindowManagerConnection>; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 NativeWidget* WindowManagerConnection::CreateNativeWidget( | 80 NativeWidget* WindowManagerConnection::CreateNativeWidget( |
81 const Widget::InitParams& init_params, | 81 const Widget::InitParams& init_params, |
82 internal::NativeWidgetDelegate* delegate) { | 82 internal::NativeWidgetDelegate* delegate) { |
83 std::map<std::string, std::vector<uint8_t>> properties; | 83 std::map<std::string, std::vector<uint8_t>> properties; |
84 NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties); | 84 NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties); |
85 return new NativeWidgetMus(delegate, shell_, NewWindow(properties), | 85 return new NativeWidgetMus(delegate, shell_, NewWindow(properties), |
86 mus::mojom::SurfaceType::DEFAULT); | 86 mus::mojom::SurfaceType::DEFAULT); |
87 } | 87 } |
88 | 88 |
89 } // namespace views | 89 } // namespace views |
OLD | NEW |