| Index: ui/ozone/platform/dri/screen_manager.cc
|
| diff --git a/ui/ozone/platform/dri/screen_manager.cc b/ui/ozone/platform/dri/screen_manager.cc
|
| index 081de693ee7cc3a893d4fad1bcc78162fd205fde..6330387168ec28ab01f649b5d077495e7093f296 100644
|
| --- a/ui/ozone/platform/dri/screen_manager.cc
|
| +++ b/ui/ozone/platform/dri/screen_manager.cc
|
| @@ -117,12 +117,6 @@ base::WeakPtr<HardwareDisplayController> ScreenManager::GetDisplayController(
|
| if (it != controllers_.end())
|
| return (*it)->AsWeakPtr();
|
|
|
| - // If no active controllers then pick the first controller at the location.
|
| - // TODO(dnicoara): Remove once async display configuration is fully supported.
|
| - it = FindDisplayControllerByLocation(bounds);
|
| - if (it != controllers_.end())
|
| - return (*it)->AsWeakPtr();
|
| -
|
| return base::WeakPtr<HardwareDisplayController>();
|
| }
|
|
|
| @@ -153,21 +147,6 @@ ScreenManager::FindActiveDisplayControllerByLocation(const gfx::Rect& bounds) {
|
| return controllers_.end();
|
| }
|
|
|
| -ScreenManager::HardwareDisplayControllers::iterator
|
| -ScreenManager::FindDisplayControllerByLocation(const gfx::Rect& bounds) {
|
| - for (HardwareDisplayControllers::iterator it = controllers_.begin();
|
| - it != controllers_.end();
|
| - ++it) {
|
| - gfx::Rect controller_bounds((*it)->origin(), (*it)->GetModeSize());
|
| - // We don't perform a strict check since content_shell will have windows
|
| - // smaller than the display size.
|
| - if (controller_bounds.Contains(bounds))
|
| - return it;
|
| - }
|
| -
|
| - return controllers_.end();
|
| -}
|
| -
|
| void ScreenManager::ForceInitializationOfPrimaryDisplay() {
|
| LOG(WARNING) << "Forcing initialization of primary display.";
|
| ScopedVector<HardwareDisplayControllerInfo> displays =
|
|
|