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 #include "ui/views/mus/screen_mus.h" | 5 #include "ui/views/mus/screen_mus.h" |
6 | 6 |
7 #include "mojo/converters/geometry/geometry_type_converters.h" | 7 #include "mojo/converters/geometry/geometry_type_converters.h" |
8 #include "mojo/shell/public/cpp/connection.h" | 8 #include "services/shell/public/cpp/connection.h" |
9 #include "mojo/shell/public/cpp/connector.h" | 9 #include "services/shell/public/cpp/connector.h" |
10 #include "ui/gfx/display_finder.h" | 10 #include "ui/gfx/display_finder.h" |
11 #include "ui/gfx/display_observer.h" | 11 #include "ui/gfx/display_observer.h" |
12 #include "ui/views/mus/screen_mus_delegate.h" | 12 #include "ui/views/mus/screen_mus_delegate.h" |
13 #include "ui/views/mus/window_manager_frame_values.h" | 13 #include "ui/views/mus/window_manager_frame_values.h" |
14 | 14 |
15 namespace mojo { | 15 namespace mojo { |
16 | 16 |
17 template <> | 17 template <> |
18 struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> { | 18 struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> { |
19 static gfx::Display Convert(const mus::mojom::DisplayPtr& input) { | 19 static gfx::Display Convert(const mus::mojom::DisplayPtr& input) { |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 DCHECK_NE(-1, index); | 228 DCHECK_NE(-1, index); |
229 // Another display must become primary before the existing primary is | 229 // Another display must become primary before the existing primary is |
230 // removed. | 230 // removed. |
231 DCHECK_NE(index, primary_display_index_); | 231 DCHECK_NE(index, primary_display_index_); |
232 const gfx::Display display = displays_[index]; | 232 const gfx::Display display = displays_[index]; |
233 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, | 233 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, |
234 OnDisplayRemoved(display)); | 234 OnDisplayRemoved(display)); |
235 } | 235 } |
236 | 236 |
237 } // namespace views | 237 } // namespace views |
OLD | NEW |