| Index: ash/display/multi_display_manager.cc
|
| diff --git a/ash/display/multi_display_manager.cc b/ash/display/multi_display_manager.cc
|
| index 5098e0a8ad3df8f4a725c96761c86f11c712a603..becb5f46a6b252441250ab4e92bca1ebff26e9bb 100644
|
| --- a/ash/display/multi_display_manager.cc
|
| +++ b/ash/display/multi_display_manager.cc
|
| @@ -154,9 +154,8 @@ const gfx::Display& MultiDisplayManager::GetDisplayNearestWindow(
|
|
|
| const gfx::Display& MultiDisplayManager::GetDisplayNearestPoint(
|
| const gfx::Point& point) const {
|
| - if (!internal::DisplayController::IsVirtualScreenCoordinatesEnabled())
|
| + if (!DisplayController::IsExtendedDesktopEnabled())
|
| return displays_[0];
|
| -
|
| for (std::vector<gfx::Display>::const_iterator iter = displays_.begin();
|
| iter != displays_.end(); ++iter) {
|
| const gfx::Display& display = *iter;
|
| @@ -170,7 +169,7 @@ const gfx::Display& MultiDisplayManager::GetDisplayNearestPoint(
|
|
|
| const gfx::Display& MultiDisplayManager::GetDisplayMatching(
|
| const gfx::Rect& rect) const {
|
| - if (!internal::DisplayController::IsVirtualScreenCoordinatesEnabled())
|
| + if (!DisplayController::IsExtendedDesktopEnabled())
|
| return displays_[0];
|
| if (rect.IsEmpty())
|
| return GetDisplayNearestPoint(rect.origin());
|
| @@ -276,7 +275,7 @@ gfx::Display& MultiDisplayManager::FindDisplayForRootWindow(
|
| void MultiDisplayManager::AddDisplayFromSpec(const std::string& spec) {
|
| gfx::Display display = CreateDisplayFromSpec(spec);
|
|
|
| - if (internal::DisplayController::IsVirtualScreenCoordinatesEnabled()) {
|
| + if (DisplayController::IsExtendedDesktopEnabled()) {
|
| const gfx::Insets insets = display.GetWorkAreaInsets();
|
| const gfx::Rect& native_bounds = display.bounds_in_pixel();
|
| display.set_bounds(
|
|
|