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" |
(...skipping 10 matching lines...) Expand all Loading... |
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 |
28 gfx::Display::Rotation GFXRotationFromMojomRotation( | 28 gfx::Display::Rotation GFXRotationFromMojomRotation( |
29 mus::mojom::Rotation input) { | 29 mus::mojom::Rotation input) { |
30 switch (input) { | 30 switch (input) { |
31 case mus::mojom::ROTATION_VALUE_0: | 31 case mus::mojom::Rotation::VALUE_0: |
32 return gfx::Display::ROTATE_0; | 32 return gfx::Display::ROTATE_0; |
33 case mus::mojom::ROTATION_VALUE_90: | 33 case mus::mojom::Rotation::VALUE_90: |
34 return gfx::Display::ROTATE_90; | 34 return gfx::Display::ROTATE_90; |
35 case mus::mojom::ROTATION_VALUE_180: | 35 case mus::mojom::Rotation::VALUE_180: |
36 return gfx::Display::ROTATE_180; | 36 return gfx::Display::ROTATE_180; |
37 case mus::mojom::ROTATION_VALUE_270: | 37 case mus::mojom::Rotation::VALUE_270: |
38 return gfx::Display::ROTATE_270; | 38 return gfx::Display::ROTATE_270; |
39 } | 39 } |
40 return gfx::Display::ROTATE_0; | 40 return gfx::Display::ROTATE_0; |
41 } | 41 } |
42 | 42 |
43 template <> | 43 template <> |
44 struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> { | 44 struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> { |
45 static gfx::Display Convert(const mus::mojom::DisplayPtr& input) { | 45 static gfx::Display Convert(const mus::mojom::DisplayPtr& input) { |
46 gfx::Display result; | 46 gfx::Display result; |
47 result.set_id(input->id); | 47 result.set_id(input->id); |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 | 150 |
151 void WindowManagerConnection::OnConnectionLost( | 151 void WindowManagerConnection::OnConnectionLost( |
152 mus::WindowTreeConnection* connection) {} | 152 mus::WindowTreeConnection* connection) {} |
153 | 153 |
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::SurfaceType::DEFAULT); |
161 } | 161 } |
162 | 162 |
163 } // namespace views | 163 } // namespace views |
OLD | NEW |