Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Unified Diff: ash/wm/coordinate_conversion.cc

Issue 286913009: ash: Do a null-check for the screen-position client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/coordinate_conversion.cc
diff --git a/ash/wm/coordinate_conversion.cc b/ash/wm/coordinate_conversion.cc
index dde314f09fc4a3ad35a9fa2dae876fcaf7e6603b..e32ddcdc1be537da27923d811a764fc185a271be 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);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698