| 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 "base/threading/thread_restrictions.h" |
| 7 #include "mojo/converters/geometry/geometry_type_converters.h" | 8 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 8 #include "services/shell/public/cpp/connection.h" | 9 #include "services/shell/public/cpp/connection.h" |
| 9 #include "services/shell/public/cpp/connector.h" | 10 #include "services/shell/public/cpp/connector.h" |
| 10 #include "ui/gfx/display_finder.h" | 11 #include "ui/gfx/display_finder.h" |
| 11 #include "ui/gfx/display_observer.h" | 12 #include "ui/gfx/display_observer.h" |
| 12 #include "ui/views/mus/screen_mus_delegate.h" | 13 #include "ui/views/mus/screen_mus_delegate.h" |
| 13 #include "ui/views/mus/window_manager_frame_values.h" | 14 #include "ui/views/mus/window_manager_frame_values.h" |
| 14 | 15 |
| 15 namespace mojo { | 16 namespace mojo { |
| 16 | 17 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 changed_display.device_scale_factor()) { | 137 changed_display.device_scale_factor()) { |
| 137 local_display->set_device_scale_factor( | 138 local_display->set_device_scale_factor( |
| 138 changed_display.device_scale_factor()); | 139 changed_display.device_scale_factor()); |
| 139 changed_values |= gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR; | 140 changed_values |= gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR; |
| 140 } | 141 } |
| 141 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, | 142 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, |
| 142 OnDisplayMetricsChanged(*local_display, changed_values)); | 143 OnDisplayMetricsChanged(*local_display, changed_values)); |
| 143 } | 144 } |
| 144 | 145 |
| 145 gfx::Point ScreenMus::GetCursorScreenPoint() { | 146 gfx::Point ScreenMus::GetCursorScreenPoint() { |
| 146 NOTIMPLEMENTED(); | 147 base::ThreadRestrictions::ScopedAllowWait allow_wait; |
| 147 return gfx::Point(); | 148 mojo::PointPtr p; |
| 149 display_manager_->GetCursorScreenPoint(&p); |
| 150 return p.To<gfx::Point>(); |
| 148 } | 151 } |
| 149 | 152 |
| 150 gfx::NativeWindow ScreenMus::GetWindowUnderCursor() { | 153 gfx::NativeWindow ScreenMus::GetWindowUnderCursor() { |
| 151 NOTIMPLEMENTED(); | 154 NOTIMPLEMENTED(); |
| 152 return nullptr; | 155 return nullptr; |
| 153 } | 156 } |
| 154 | 157 |
| 155 gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) { | 158 gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) { |
| 156 NOTIMPLEMENTED(); | 159 NOTIMPLEMENTED(); |
| 157 return nullptr; | 160 return nullptr; |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 DCHECK_NE(-1, index); | 231 DCHECK_NE(-1, index); |
| 229 // Another display must become primary before the existing primary is | 232 // Another display must become primary before the existing primary is |
| 230 // removed. | 233 // removed. |
| 231 DCHECK_NE(index, primary_display_index_); | 234 DCHECK_NE(index, primary_display_index_); |
| 232 const gfx::Display display = displays_[index]; | 235 const gfx::Display display = displays_[index]; |
| 233 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, | 236 FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_, |
| 234 OnDisplayRemoved(display)); | 237 OnDisplayRemoved(display)); |
| 235 } | 238 } |
| 236 | 239 |
| 237 } // namespace views | 240 } // namespace views |
| OLD | NEW |