diff options
Diffstat (limited to 'ash/display/screen_position_controller.cc')
-rw-r--r-- | ash/display/screen_position_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc index 80091ef..93794ac 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc @@ -56,7 +56,7 @@ void ScreenPositionController::ConvertPointToScreen( gfx::Point* point) { const aura::RootWindow* root = window->GetRootWindow(); aura::Window::ConvertPointToWindow(window, root, point); - if (DisplayController::IsVirtualScreenCoordinatesEnabled()) { + if (DisplayController::IsExtendedDesktopEnabled()) { const gfx::Point display_origin = gfx::Screen::GetDisplayNearestWindow( const_cast<aura::RootWindow*>(root)).bounds().origin(); @@ -68,7 +68,7 @@ void ScreenPositionController::ConvertPointFromScreen( const aura::Window* window, gfx::Point* point) { const aura::RootWindow* root = window->GetRootWindow(); - if (DisplayController::IsVirtualScreenCoordinatesEnabled()) { + if (DisplayController::IsExtendedDesktopEnabled()) { const gfx::Point display_origin = gfx::Screen::GetDisplayNearestWindow( const_cast<aura::RootWindow*>(root)).bounds().origin(); @@ -80,7 +80,7 @@ void ScreenPositionController::ConvertPointFromScreen( void ScreenPositionController::SetBounds( aura::Window* window, const gfx::Rect& bounds) { - if (!DisplayController::IsVirtualScreenCoordinatesEnabled() || + if (!DisplayController::IsExtendedDesktopEnabled() || !window->parent()->GetProperty(internal::kUsesScreenCoordinatesKey)) { window->SetBounds(bounds); return; |