summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
Diffstat (limited to 'ash')
-rw-r--r--ash/wm/coordinate_conversion.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/wm/coordinate_conversion.cc b/ash/wm/coordinate_conversion.cc
index dde314f..e32ddcd 100644
--- a/ash/wm/coordinate_conversion.cc
+++ b/ash/wm/coordinate_conversion.cc
@@ -32,9 +32,10 @@ aura::Window* GetRootWindowMatching(const gfx::Rect& rect) {
}
void ConvertPointToScreen(const aura::Window* window, gfx::Point* point) {
- CHECK(window);
- CHECK(window->GetRootWindow());
- CHECK(aura::client::GetScreenPositionClient(window->GetRootWindow()));
+ // It is possible for the root window to not have a screen position client
+ // when switching multi-monitor mode from extended to mirror.
+ if (!aura::client::GetScreenPositionClient(window->GetRootWindow()))
+ return;
aura::client::GetScreenPositionClient(window->GetRootWindow())->
ConvertPointToScreen(window, point);
}