OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 // This has to be before any other includes, else default is picked up. | 5 // This has to be before any other includes, else default is picked up. |
6 // See base/logging for details on this. | 6 // See base/logging for details on this. |
7 #define NOTIMPLEMENTED_POLICY 5 | 7 #define NOTIMPLEMENTED_POLICY 5 |
8 | 8 |
9 #include "ui/views/mus/screen_mus.h" | 9 #include "ui/views/mus/screen_mus.h" |
10 | 10 |
11 #include "services/service_manager/public/cpp/connection.h" | 11 #include "services/service_manager/public/cpp/connection.h" |
12 #include "services/service_manager/public/cpp/connector.h" | 12 #include "services/service_manager/public/cpp/connector.h" |
13 #include "services/ui/public/interfaces/constants.mojom.h" | 13 #include "services/ui/public/interfaces/constants.mojom.h" |
14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
15 #include "ui/views/mus/native_widget_mus.h" | |
16 #include "ui/views/mus/screen_mus_delegate.h" | 15 #include "ui/views/mus/screen_mus_delegate.h" |
17 #include "ui/views/mus/window_manager_frame_values.h" | 16 #include "ui/views/mus/window_manager_frame_values.h" |
18 | 17 |
19 namespace mojo { | 18 namespace mojo { |
20 | 19 |
21 template <> | 20 template <> |
22 struct TypeConverter<views::WindowManagerFrameValues, | 21 struct TypeConverter<views::WindowManagerFrameValues, |
23 ui::mojom::FrameDecorationValuesPtr> { | 22 ui::mojom::FrameDecorationValuesPtr> { |
24 static views::WindowManagerFrameValues Convert( | 23 static views::WindowManagerFrameValues Convert( |
25 const ui::mojom::FrameDecorationValuesPtr& input) { | 24 const ui::mojom::FrameDecorationValuesPtr& input) { |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 // TODO(kylechar): DisplayList would need to change to handle having no | 145 // TODO(kylechar): DisplayList would need to change to handle having no |
147 // primary display. | 146 // primary display. |
148 if (primary_display_id == display::kInvalidDisplayId) | 147 if (primary_display_id == display::kInvalidDisplayId) |
149 return; | 148 return; |
150 | 149 |
151 ProcessDisplayChanged(*display_list().FindDisplayById(primary_display_id), | 150 ProcessDisplayChanged(*display_list().FindDisplayById(primary_display_id), |
152 true); | 151 true); |
153 } | 152 } |
154 | 153 |
155 } // namespace views | 154 } // namespace views |
OLD | NEW |