| 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 "mojo/shell/public/cpp/connection.h" |
| 9 #include "mojo/shell/public/cpp/connector.h" | 9 #include "mojo/shell/public/cpp/connector.h" |
| 10 #include "ui/gfx/display_finder.h" | 10 #include "ui/gfx/display_finder.h" |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) { | 155 gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) { |
| 156 NOTIMPLEMENTED(); | 156 NOTIMPLEMENTED(); |
| 157 return nullptr; | 157 return nullptr; |
| 158 } | 158 } |
| 159 | 159 |
| 160 gfx::Display ScreenMus::GetPrimaryDisplay() const { | 160 gfx::Display ScreenMus::GetPrimaryDisplay() const { |
| 161 return displays_[primary_display_index_]; | 161 return displays_[primary_display_index_]; |
| 162 } | 162 } |
| 163 | 163 |
| 164 gfx::Display ScreenMus::GetDisplayNearestWindow(gfx::NativeView view) const { | 164 gfx::Display ScreenMus::GetDisplayNearestWindow(gfx::NativeView view) const { |
| 165 NOTIMPLEMENTED(); | 165 //NOTIMPLEMENTED(); |
| 166 return GetPrimaryDisplay(); | 166 return GetPrimaryDisplay(); |
| 167 } | 167 } |
| 168 | 168 |
| 169 gfx::Display ScreenMus::GetDisplayNearestPoint(const gfx::Point& point) const { | 169 gfx::Display ScreenMus::GetDisplayNearestPoint(const gfx::Point& point) const { |
| 170 return *gfx::FindDisplayNearestPoint(displays_, point); | 170 return *gfx::FindDisplayNearestPoint(displays_, point); |
| 171 } | 171 } |
| 172 | 172 |
| 173 int ScreenMus::GetNumDisplays() const { | 173 int ScreenMus::GetNumDisplays() const { |
| 174 return static_cast<int>(displays_.size()); | 174 return static_cast<int>(displays_.size()); |
| 175 } | 175 } |
| (...skipping 52 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 |