| 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 "base/threading/thread_restrictions.h" | 11 #include "base/threading/thread_restrictions.h" |
| 12 #include "components/mus/public/cpp/window_tree_connection.h" | 12 #include "components/mus/public/cpp/window_tree_connection.h" |
| 13 #include "components/mus/public/interfaces/window_tree.mojom.h" | 13 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| 14 #include "mojo/application/public/cpp/application_connection.h" | |
| 15 #include "mojo/application/public/cpp/application_impl.h" | |
| 16 #include "mojo/converters/geometry/geometry_type_converters.h" | 14 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 17 #include "mojo/converters/network/network_type_converters.h" | 15 #include "mojo/converters/network/network_type_converters.h" |
| 16 #include "mojo/shell/public/cpp/application_connection.h" |
| 17 #include "mojo/shell/public/cpp/application_impl.h" |
| 18 #include "ui/gfx/display.h" | 18 #include "ui/gfx/display.h" |
| 19 #include "ui/gfx/geometry/point_conversions.h" | 19 #include "ui/gfx/geometry/point_conversions.h" |
| 20 #include "ui/gfx/geometry/rect.h" | 20 #include "ui/gfx/geometry/rect.h" |
| 21 #include "ui/mojo/init/ui_init.h" | 21 #include "ui/mojo/init/ui_init.h" |
| 22 #include "ui/views/mus/native_widget_mus.h" | 22 #include "ui/views/mus/native_widget_mus.h" |
| 23 #include "ui/views/mus/window_manager_frame_values.h" | 23 #include "ui/views/mus/window_manager_frame_values.h" |
| 24 #include "ui/views/views_delegate.h" | 24 #include "ui/views/views_delegate.h" |
| 25 | 25 |
| 26 namespace mojo { | 26 namespace mojo { |
| 27 | 27 |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 NativeWidget* WindowManagerConnection::CreateNativeWidget( | 154 NativeWidget* WindowManagerConnection::CreateNativeWidget( |
| 155 const Widget::InitParams& init_params, | 155 const Widget::InitParams& init_params, |
| 156 internal::NativeWidgetDelegate* delegate) { | 156 internal::NativeWidgetDelegate* delegate) { |
| 157 std::map<std::string, std::vector<uint8_t>> properties; | 157 std::map<std::string, std::vector<uint8_t>> properties; |
| 158 NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties); | 158 NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties); |
| 159 return new NativeWidgetMus(delegate, app_->shell(), NewWindow(properties), | 159 return new NativeWidgetMus(delegate, app_->shell(), NewWindow(properties), |
| 160 mus::mojom::SURFACE_TYPE_DEFAULT); | 160 mus::mojom::SURFACE_TYPE_DEFAULT); |
| 161 } | 161 } |
| 162 | 162 |
| 163 } // namespace views | 163 } // namespace views |
| OLD | NEW |